EasyTag 2.1.3

93 files changed, 38295 insertions, 21393 deletions

diff --git a/ChangeLog b/ChangeLog
index eb3c3f8..49edace 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2.1.3 - October 15th, 2007 :
+============================
+    * The "convert" function of the 'Process Fields' scanner was improved to
+      allow to replace a string to an other one (instead of only one character),
+    * Added a option to limit the number of lines in the log view,
+    * Added ability to show or hide the log view,
+    * Added command buttons in the "Load TXT file" windows,
+    * Added support of .oga extension,
+    * The "Process Fields" scanner set to uppercase roman numerals (thanks to
+      Slash Bunny),
+    * Fixed problem with the "Encoded by" field in Id3v2.4 tags (thanks to 
+      Adrian Bunk),
+    * Fixed rules of the "process fields" to follows The Chicago Manual of Style
+      more closely(thanks to Slash Bunny),
+    * Fixed bug with UTF-8 characters in the "convert" function of the 'Process
+      Fields' scanner,
+    * Fixed problem with the browser window that stays grayed out if the 
+      selected directory doesn't exist,
+    * Fixed file descriptor leak in the cddb search,
+    * Improved displaying of extensions supported in the About window,
+    * Improved selection of directories, in the browser tree, if it doesn't
+      exist on the file system, the tree is refreshed automatically.
+    * New Serbian translation (thanks to Miloš Popović),
+    * Swedish translation updated (thanks to Anders Strömer),
+    * Polish translation updated (thanks to Tomasz Sałaciński and Michał Smoczyk),
+    * German translation updated (thanks to Götz Waschk),
+    * Czech translation updated (thanks to Zbyněk Mrkvička),
+    * French translation updated.
+
+
 2.1.2 - July 12th, 2007 :
 =========================
     * Added an option to update modification time of the parent directory when 
@@ -13,7 +43,6 @@
     * Brazilian Portuguese translation updated (thanks to doutor.zero),
     * Polish translation updated (thanks to Michał Smoczyk),
     * German translation updated (thanks to Götz Waschk),
-    * French translation updated.
 
 
 2.1.1 - July 4th, 2007 :
diff --git a/Makefile.am b/Makefile.am
index 1653a50..6b1f6a6 100755..100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@ BITMAPS = \
     pixmaps/closed_folder_locked.xpm \
     pixmaps/closed_folder.xpm \
     pixmaps/EasyTAG.ico \
+    pixmaps/EasyTAG_icon.xpm \
     pixmaps/EasyTAG2.ico \
-    pixmaps/EasyTAG.xpm \
     pixmaps/EasyTAG2.xpm \
     pixmaps/first_letter_uppercase.xpm \
     pixmaps/first_letter_uppercase_word.xpm \
@@ -45,10 +45,12 @@ BITMAPS = \
     pixmaps/unselect_all.xpm
 
 pixmapdir = $(datadir)/$(PACKAGE)
-pixmap_DATA = pixmaps/EasyTAG_logo.xpm
+pixmap_DATA = \
+    pixmaps/EasyTAG_logo.xpm
+
 
 icondir = $(datadir)/pixmaps
-icon_DATA = pixmaps/EasyTAG.xpm
+icon_DATA = pixmaps/EasyTAG_icon.xpm
 
 
 EXTRA_DIST= \
diff --git a/Makefile.in b/Makefile.in
index a0e20c7..5d788c2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -36,19 +32,19 @@ 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 acconfig.h config.guess config.sub depcomp \
 	install-sh ltmain.sh missing mkinstalldirs
-subdir = .
 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 configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = easytag.spec doc/easytag.1
@@ -56,10 +52,11 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-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
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(gnome_menudir)" \
 	"$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapdir)" \
@@ -77,6 +74,8 @@ iconDATA_INSTALL = $(INSTALL_DATA)
 pixmapDATA_INSTALL = $(INSTALL_DATA)
 textDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(gnome_menu_DATA) $(icon_DATA) $(pixmap_DATA) $(text_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -92,8 +91,6 @@ GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -131,8 +128,10 @@ 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@
@@ -146,11 +145,11 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
 OBJEXT = @OBJEXT@
 OGG_CFLAGS = @OGG_CFLAGS@
 OGG_LIBS = @OGG_LIBS@
@@ -178,17 +177,13 @@ VORBIS_LIBS = @VORBIS_LIBS@
 WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+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_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -200,28 +195,39 @@ 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@
 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_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = dist-bzip2
 SUBDIRS = src po
 gnome_menudir = $(datadir)/applications
@@ -240,8 +246,8 @@ BITMAPS = \
     pixmaps/closed_folder_locked.xpm \
     pixmaps/closed_folder.xpm \
     pixmaps/EasyTAG.ico \
+    pixmaps/EasyTAG_icon.xpm \
     pixmaps/EasyTAG2.ico \
-    pixmaps/EasyTAG.xpm \
     pixmaps/EasyTAG2.xpm \
     pixmaps/first_letter_uppercase.xpm \
     pixmaps/first_letter_uppercase_word.xpm \
@@ -264,9 +270,11 @@ BITMAPS = \
     pixmaps/unselect_all.xpm
 
 pixmapdir = $(datadir)/$(PACKAGE)
-pixmap_DATA = pixmaps/EasyTAG_logo.xpm
+pixmap_DATA = \
+    pixmaps/EasyTAG_logo.xpm
+
 icondir = $(datadir)/pixmaps
-icon_DATA = pixmaps/EasyTAG.xpm
+icon_DATA = pixmaps/EasyTAG_icon.xpm
 EXTRA_DIST = \
     $(gnome_menu_DATA) \
     $(text_DATA) \
@@ -415,7 +423,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -441,10 +449,9 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool
-uninstall-info-am:
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
 	for i in $$l2; do \
@@ -489,7 +496,7 @@ uninstall-man1:
 	done
 install-gnome_menuDATA: $(gnome_menu_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(gnome_menudir)" || $(mkdir_p) "$(DESTDIR)$(gnome_menudir)"
+	test -z "$(gnome_menudir)" || $(MKDIR_P) "$(DESTDIR)$(gnome_menudir)"
 	@list='$(gnome_menu_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -506,7 +513,7 @@ uninstall-gnome_menuDATA:
 	done
 install-iconDATA: $(icon_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
+	test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
 	@list='$(icon_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -523,7 +530,7 @@ uninstall-iconDATA:
 	done
 install-pixmapDATA: $(pixmap_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pixmapdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapdir)"
+	test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
 	@list='$(pixmap_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -540,7 +547,7 @@ uninstall-pixmapDATA:
 	done
 install-textDATA: $(text_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(textdir)" || $(mkdir_p) "$(DESTDIR)$(textdir)"
+	test -z "$(textdir)" || $(MKDIR_P) "$(DESTDIR)$(textdir)"
 	@list='$(text_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -587,8 +594,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -690,24 +696,22 @@ distclean-tags:
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/debian $(distdir)/doc $(distdir)/doc/id3 $(distdir)/doc/users_guide_french $(distdir)/doc/users_guide_french/images $(distdir)/doc/users_guide_german $(distdir)/doc/users_guide_german/images $(distdir)/doc/vorbis $(distdir)/pixmaps $(distdir)/po
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -721,7 +725,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -729,6 +733,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -736,7 +742,7 @@ distdir: $(DISTFILES)
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -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 $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -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
@@ -811,7 +817,7 @@ distcheck: dist
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -836,7 +842,7 @@ 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"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -885,12 +891,20 @@ info-am:
 install-data-am: install-gnome_menuDATA install-iconDATA install-man \
 	install-pixmapDATA install-textDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man: install-man1
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -912,31 +926,32 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-gnome_menuDATA uninstall-iconDATA \
-	uninstall-info-am uninstall-man uninstall-pixmapDATA \
-	uninstall-textDATA
-
-uninstall-info: uninstall-info-recursive
+	uninstall-man uninstall-pixmapDATA uninstall-textDATA
 
 uninstall-man: uninstall-man1
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-libtool clean-recursive \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-shar dist-tarZ dist-zip distcheck distclean \
 	distclean-generic distclean-hdr distclean-libtool \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-gnome_menuDATA install-iconDATA \
-	install-info install-info-am install-man install-man1 \
-	install-pixmapDATA install-strip install-textDATA installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	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-info-am uninstall-man \
-	uninstall-man1 uninstall-pixmapDATA uninstall-textDATA
+	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.
diff --git a/THANKS b/THANKS
index 9fb1dfc..d8a184d 100644
--- a/THANKS
+++ b/THANKS
@@ -90,7 +90,7 @@ Philipp Thomas <pthomas@suse.de>
 Holger Schemel <aeglos@valinor.owl.de>
   - patch to fix tag priority problem with id3lib
 
-Bj�rn Olievier <bjorn.olievier@advalvas.be>:
+Björn Olievier <bjorn.olievier@advalvas.be>:
   - Dutch translation
   - bug reports
 
@@ -211,9 +211,12 @@ Pierre Dumuid <pierre.dumuid@adelaide.edu.au>
 Yuval Hager <yuval@avramzon.net>
   - Hebrew translation
 
-Anders Str�mer <anders.stromer@comhem.se>
+Anders Strömer <anders.stromer@comhem.se>
   - Swedich documentation
 
+Miloš Popović <gpopac@gmail.com>
+  - Serbian translation
+
 
 My thanks to all :)
     Jerome
diff --git a/aclocal.m4 b/aclocal.m4
index 2a1fcdb..0db1722 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 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.
@@ -11,6 +11,11 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
 # Configure paths for GLIB
 # Owen Taylor     1997-2001
 
@@ -428,6 +433,20 @@ glib_DEFUN([GLIB_WITH_NLS],
           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@bar.xx>\n"
+"Language-Team: C <LL@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)'`"], :)
@@ -623,6 +642,23 @@ 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
 
@@ -2406,7 +2442,7 @@ linux*)
 
   # 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/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    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/^[	 ]*//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -5114,9 +5150,6 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
 # Is the compiler the GNU C compiler?
 with_gcc=$_LT_AC_TAGVAR(GCC, $1)
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -5250,11 +5283,11 @@ striplib=$lt_striplib
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -5266,7 +5299,7 @@ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -5346,7 +5379,7 @@ variables_saved_for_relink="$variables_saved_for_relink"
 link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+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
@@ -7377,7 +7410,7 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -7387,14 +7420,29 @@ fi[]dnl
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+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.10], [],
+      [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 so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -7451,14 +7499,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 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.
 
-# serial 7
+# serial 8
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -7467,8 +7515,10 @@ 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])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -7482,15 +7532,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 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.
 
-# serial 8
+# serial 9
 
 # 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,
@@ -7518,6 +7567,7 @@ 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=])
 
@@ -7583,6 +7633,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -7635,7 +7686,8 @@ if test "x$enable_dependency_tracking" != xno; then
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -7660,8 +7712,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # 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.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # 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 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -7720,8 +7773,8 @@ 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
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 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,
@@ -7744,16 +7797,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # 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.58])dnl
+[AC_PREREQ([2.60])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
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+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
@@ -7773,6 +7830,9 @@ m4_ifval([$2],
  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
 
@@ -7808,6 +7868,10 @@ 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
 ])
 ])
 
@@ -7843,7 +7907,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -7950,14 +8014,14 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 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 4
+# serial 5
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -7973,6 +8037,7 @@ AC_SUBST($1)])
 # 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
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@@ -7983,7 +8048,7 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# 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,
@@ -7991,60 +8056,23 @@ fi
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([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 -*-
 
@@ -8156,9 +8184,21 @@ 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="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 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_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
diff --git a/config.guess b/config.guess
index 2fc3acc..396482d 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2003-06-17'
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,13 +18,15 @@ timestamp='2003-06-17'
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, 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.
 
+
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -53,7 +56,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -66,11 +69,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -104,7 +107,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -123,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -136,13 +139,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-## for Red Hat Linux
-if test -f /etc/redhat-release ; then
-    VENDOR=redhat ;
-else
-    VENDOR= ;
-fi
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -203,50 +199,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
     alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
 	# covers most systems running today.  This code pipes the CPU
@@ -284,42 +262,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    "EV7.9 (21364A)")
 		UNAME_MACHINE="alphaev79" ;;
 	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -327,32 +312,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -361,10 +346,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -376,10 +361,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -390,37 +375,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -444,32 +432,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -485,29 +474,29 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -515,7 +504,7 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -530,14 +519,18 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
+	exit ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -551,28 +544,28 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -634,9 +627,19 @@ EOF
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -644,11 +647,11 @@ EOF
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -676,150 +679,179 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
-	exit 0 ;;
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-	exit 0 ;;
+	exit ;;
+    *:FreeBSD:*:*)
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
+	exit ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
+    x86:Interix*:[3456]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[3456]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-gnu
+	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -836,8 +868,12 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -855,15 +891,22 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-${VENDOR:-unknown}-linux-gnu
-	exit 0 ;;
+	echo powerpc-unknown-linux-gnu
+	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-${VENDOR:-unknown}-linux-gnu
-	exit 0 ;;
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -877,7 +920,7 @@ EOF
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -885,25 +928,28 @@ EOF
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-${VENDOR:-unknown}-linux-gnu
-	exit 0 ;;
+	echo x86_64-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -921,15 +967,15 @@ EOF
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
+		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -946,23 +992,33 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
 	#endif
 	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -970,24 +1026,27 @@ EOF
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
+	exit ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -995,15 +1054,16 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1021,73 +1081,73 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit 0 ;;
+	exit ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1095,68 +1155,72 @@ EOF
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
-	case `uname -p` in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1164,22 +1228,25 @@ EOF
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1190,28 +1257,47 @@ EOF
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
+	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1243,7 +1329,7 @@ main ()
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1332,11 +1418,12 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1345,22 +1432,22 @@ then
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
@@ -1371,7 +1458,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/config.h.in b/config.h.in
index 71af7a1..05e4479 100644
--- a/config.h.in
+++ b/config.h.in
@@ -230,7 +230,7 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Define as `fork' if `vfork' does not work. */
diff --git a/config.h.mingw b/config.h.mingw
index 409b1ec..27046e8 100755
--- a/config.h.mingw
+++ b/config.h.mingw
@@ -341,7 +341,7 @@
 #define PACKAGE "easytag"
 
 /* Version number of package */
-#define VERSION "2.1.1"
+#define VERSION "2.1.3"
 
 /* Define if you have the iconv() function. */
 /* #undef HAVE_ICONV */
diff --git a/config.sub b/config.sub
index 6b2ff9f..fab0aa3 100755
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2003-06-18'
+timestamp='2006-09-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +22,15 @@ timestamp='2003-06-18'
 #
 # 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.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, 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.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +72,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +85,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +101,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -118,7 +120,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -144,7 +148,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@@ -169,6 +173,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +193,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -228,14 +240,17 @@ case $basic_machine in
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| ip2k | iq2000 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -244,28 +259,33 @@ case $basic_machine in
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| s390 | s390x \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -276,6 +296,9 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -295,20 +318,20 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -317,31 +340,36 @@ case $basic_machine in
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
 	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -361,6 +389,9 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -378,6 +409,9 @@ case $basic_machine in
 	amd64)
 		basic_machine=x86_64-pc
 		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -437,12 +471,27 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -465,6 +514,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -643,10 +696,6 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -659,6 +708,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -727,10 +779,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -738,9 +786,12 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
 		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
@@ -767,6 +818,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -823,6 +880,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -833,6 +894,12 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
@@ -843,6 +910,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -956,6 +1027,10 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -999,6 +1074,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1029,6 +1108,9 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1045,13 +1127,10 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1124,19 +1203,23 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1154,12 +1237,15 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1172,6 +1258,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1193,6 +1282,9 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1215,6 +1307,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1251,6 +1346,9 @@ case $os in
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
 	-none)
 		;;
 	*)
@@ -1273,6 +1371,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1282,8 +1386,8 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-	c4x-* | tic4x-*)
-		os=-coff
+        c4x-* | tic4x-*)
+        	os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1328,9 +1432,15 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1463,9 +1573,15 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
@@ -1490,7 +1606,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/configure b/configure
index 20942d4..56a139a 100755
--- a/configure
+++ b/configure
@@ -1,25 +1,54 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for easytag 2.1.2.
+# Generated by GNU Autoconf 2.61 for easytag 2.1.3.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 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 Bourne compatible
+# 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=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# 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
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -29,8 +58,43 @@ else
 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.)
+as_nl='
+'
+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
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -44,18 +108,19 @@ do
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+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
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -63,157 +128,388 @@ fi
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# CDPATH.
+$as_unset CDPATH
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# 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
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
 fi
 
+  if test $as_have_required = yes && 	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  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
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-       ;;
-  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
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
+  case $as_dir in
 	 /*)
-	   if ("$as_dir/$as_base" -c '
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+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
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+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
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell autoconf@gnu.org about your system,
+  echo including any error possibly output before this
+  echo message
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
+  chmod +x "$as_me.lineno" ||
     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); 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 sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 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
+fi
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
+  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'
-  else
-    as_ln_s='ln -s'
-  fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+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=:
@@ -222,7 +518,28 @@ else
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+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'"
@@ -231,15 +548,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
 
 
 # Check that we are running under the correct shell.
@@ -395,76 +703,234 @@ tagnames=${tagnames+${tagnames},}CXX
 
 tagnames=${tagnames+${tagnames},}F77
 
+exec 7<&0 </dev/null 6>&1
+
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-exec 6>&1
-
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_files=
 ac_config_libobj_dir=.
+LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
 # Identity of this package.
 PACKAGE_NAME='easytag'
 PACKAGE_TARNAME='easytag'
-PACKAGE_VERSION='2.1.2'
-PACKAGE_STRING='easytag 2.1.2'
+PACKAGE_VERSION='2.1.3'
+PACKAGE_STRING='easytag 2.1.3'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/easytag.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GETTEXT_PACKAGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP F77 FFLAGS ac_ct_F77 LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PKG_CONFIG ac_pt_PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS GTK_CFLAGS GTK_LIBS OGG_CFLAGS OGG_LIBS VORBIS_CFLAGS VORBIS_LIBS WAVPACK_CFLAGS WAVPACK_LIBS LIBOBJS USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LTLIBOBJS'
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+am__isrc
+CYGPATH_W
+PACKAGE
+VERSION
+ACLOCAL
+AUTOCONF
+AUTOMAKE
+AUTOHEADER
+MAKEINFO
+install_sh
+STRIP
+INSTALL_STRIP_PROGRAM
+mkdir_p
+AWK
+SET_MAKE
+am__leading_dot
+AMTAR
+am__tar
+am__untar
+GETTEXT_PACKAGE
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+DEPDIR
+am__include
+am__quote
+AMDEP_TRUE
+AMDEP_FALSE
+AMDEPBACKSLASH
+CCDEPMODE
+am__fastdepCC_TRUE
+am__fastdepCC_FALSE
+CXX
+CXXFLAGS
+ac_ct_CXX
+CXXDEPMODE
+am__fastdepCXX_TRUE
+am__fastdepCXX_FALSE
+CXXCPP
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+SED
+GREP
+EGREP
+LN_S
+ECHO
+AR
+RANLIB
+CPP
+F77
+FFLAGS
+ac_ct_F77
+LIBTOOL
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
+PKG_CONFIG
+GLIB_CFLAGS
+GLIB_LIBS
+GLIB_GENMARSHAL
+GOBJECT_QUERY
+GLIB_MKENUMS
+GTK_CFLAGS
+GTK_LIBS
+OGG_CFLAGS
+OGG_LIBS
+VORBIS_CFLAGS
+VORBIS_LIBS
+WAVPACK_CFLAGS
+WAVPACK_LIBS
+LIBOBJS
+USE_NLS
+MSGFMT
+MSGFMT_OPTS
+GMSGFMT
+XGETTEXT
+CATALOGS
+CATOBJEXT
+DATADIRNAME
+GMOFILES
+INSTOBJEXT
+INTLLIBS
+PO_IN_DATADIR_TRUE
+PO_IN_DATADIR_FALSE
+POFILES
+POSUB
+MKINSTALLDIRS
+LTLIBOBJS'
 ac_subst_files=''
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CXX
+CXXFLAGS
+CCC
+CXXCPP
+CPP
+F77
+FFLAGS
+PKG_CONFIG
+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=
@@ -491,34 +957,48 @@ x_libraries=NONE
 # 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'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+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"
+    eval $ac_prev=\$ac_option
     ac_prev=
     continue
   fi
 
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_option in
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
@@ -540,33 +1020,45 @@ do
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+  -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
+  -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_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=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_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -593,6 +1085,12 @@ do
   -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 ;;
@@ -617,13 +1115,16 @@ do
   | --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 | --local | --loca | --loc | --lo)
+  | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -688,6 +1189,16 @@ do
   | --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 ;;
@@ -740,24 +1251,20 @@ do
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -788,8 +1295,7 @@ Try \`$0 --help' for more information." >&2
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
+    eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
@@ -809,27 +1315,19 @@ if test -n "$ac_prev"; then
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
+# Be sure to have absolute directory names.
+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=$`echo $ac_var`
+  eval ac_val=\$$ac_var
   case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -856,130 +1354,76 @@ 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 .` ||
+  { echo "$as_me: error: Working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
 # 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 its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$0" ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$0" : 'X\(//\)[^/]' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    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
+  if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
-  fi
 fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_F77_set=${F77+set}
-ac_env_F77_value=$F77
-ac_cv_env_F77_set=${F77+set}
-ac_cv_env_F77_value=$F77
-ac_env_FFLAGS_set=${FFLAGS+set}
-ac_env_FFLAGS_value=$FFLAGS
-ac_cv_env_FFLAGS_set=${FFLAGS+set}
-ac_cv_env_FFLAGS_value=$FFLAGS
-ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_env_GTK_CFLAGS_set=${GTK_CFLAGS+set}
-ac_env_GTK_CFLAGS_value=$GTK_CFLAGS
-ac_cv_env_GTK_CFLAGS_set=${GTK_CFLAGS+set}
-ac_cv_env_GTK_CFLAGS_value=$GTK_CFLAGS
-ac_env_GTK_LIBS_set=${GTK_LIBS+set}
-ac_env_GTK_LIBS_value=$GTK_LIBS
-ac_cv_env_GTK_LIBS_set=${GTK_LIBS+set}
-ac_cv_env_GTK_LIBS_value=$GTK_LIBS
-ac_env_OGG_CFLAGS_set=${OGG_CFLAGS+set}
-ac_env_OGG_CFLAGS_value=$OGG_CFLAGS
-ac_cv_env_OGG_CFLAGS_set=${OGG_CFLAGS+set}
-ac_cv_env_OGG_CFLAGS_value=$OGG_CFLAGS
-ac_env_OGG_LIBS_set=${OGG_LIBS+set}
-ac_env_OGG_LIBS_value=$OGG_LIBS
-ac_cv_env_OGG_LIBS_set=${OGG_LIBS+set}
-ac_cv_env_OGG_LIBS_value=$OGG_LIBS
-ac_env_VORBIS_CFLAGS_set=${VORBIS_CFLAGS+set}
-ac_env_VORBIS_CFLAGS_value=$VORBIS_CFLAGS
-ac_cv_env_VORBIS_CFLAGS_set=${VORBIS_CFLAGS+set}
-ac_cv_env_VORBIS_CFLAGS_value=$VORBIS_CFLAGS
-ac_env_VORBIS_LIBS_set=${VORBIS_LIBS+set}
-ac_env_VORBIS_LIBS_value=$VORBIS_LIBS
-ac_cv_env_VORBIS_LIBS_set=${VORBIS_LIBS+set}
-ac_cv_env_VORBIS_LIBS_value=$VORBIS_LIBS
-ac_env_WAVPACK_CFLAGS_set=${WAVPACK_CFLAGS+set}
-ac_env_WAVPACK_CFLAGS_value=$WAVPACK_CFLAGS
-ac_cv_env_WAVPACK_CFLAGS_set=${WAVPACK_CFLAGS+set}
-ac_cv_env_WAVPACK_CFLAGS_value=$WAVPACK_CFLAGS
-ac_env_WAVPACK_LIBS_set=${WAVPACK_LIBS+set}
-ac_env_WAVPACK_LIBS_value=$WAVPACK_LIBS
-ac_cv_env_WAVPACK_LIBS_set=${WAVPACK_LIBS+set}
-ac_cv_env_WAVPACK_LIBS_value=$WAVPACK_LIBS
+	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.
@@ -988,7 +1432,7 @@ 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.2 to adapt to many kinds of systems.
+\`configure' configures easytag 2.1.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1008,9 +1452,6 @@ Configuration:
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
-_ACEOF
-
-  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
 			  [$ac_default_prefix]
@@ -1028,15 +1469,22 @@ 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]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
   --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]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
+  --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
@@ -1054,7 +1502,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of easytag 2.1.2:";;
+     short | recursive ) echo "Configuration of easytag 2.1.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1063,10 +1511,8 @@ Optional Features:
   --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-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)
@@ -1091,16 +1537,16 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
-  --with-tags[=TAGS]
-                          include additional configurations [automatic]
+  --with-tags[=TAGS]      include additional configurations [automatic]
 
 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>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    C/C++/Objective 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
@@ -1124,120 +1570,86 @@ Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 _ACEOF
+ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
+    test -d "$ac_dir" || continue
     ac_builddir=.
 
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`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
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    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 ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
+    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
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style 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
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
+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
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-easytag configure 2.1.2
-generated by GNU Autoconf 2.59
+easytag configure 2.1.3
+generated by GNU Autoconf 2.61
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 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 0
+  exit
 fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+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.2, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+It was created by easytag $as_me 2.1.3, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
+exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -1256,7 +1668,7 @@ uname -v = `(uname -v) 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`
-hostinfo               = `(hostinfo) 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`
@@ -1270,6 +1682,7 @@ do
   test -z "$as_dir" && as_dir=.
   echo "PATH: $as_dir"
 done
+IFS=$as_save_IFS
 
 } >&5
 
@@ -1291,7 +1704,6 @@ _ACEOF
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
-ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -1302,7 +1714,7 @@ do
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    *\'*)
       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
@@ -1324,9 +1736,7 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
+      ac_configure_args="$ac_configure_args '$ac_arg'"
       ;;
     esac
   done
@@ -1337,8 +1747,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_
 # 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: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# 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.
   {
@@ -1351,20 +1761,34 @@ trap 'exit_status=$?
 _ASBOX
     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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
   (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    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"
-      ;;
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
     *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-}
+    esac |
+    sort
+)
     echo
 
     cat <<\_ASBOX
@@ -1375,22 +1799,28 @@ _ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
 _ASBOX
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1402,26 +1832,24 @@ _ASBOX
 ## ----------- ##
 _ASBOX
       echo
-      sed "/^$/d" confdefs.h | sort
+      cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-     ' 0
+' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
 
 # Predefined preprocessor variables.
 
@@ -1452,14 +1880,17 @@ _ACEOF
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
+if test -n "$CONFIG_SITE"; then
+  set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+  set x "$ac_default_prefix/share/config.site" \
+	"$ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in $CONFIG_SITE; do
+shift
+for ac_site_file
+do
   if test -r "$ac_site_file"; then
     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -1475,8 +1906,8 @@ if test -r "$cache_file"; then
     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
     esac
   fi
 else
@@ -1488,12 +1919,11 @@ fi
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+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"
+  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,)
       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
@@ -1518,8 +1948,7 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1536,11 +1965,6 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov
    { (exit 1); exit 1; }; }
 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
 
 
 
@@ -1565,35 +1989,46 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+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.10'
 
-am__api_version="1.9"
 ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
+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
+  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
+  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
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# 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
@@ -1608,8 +2043,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # 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.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1631,7 +2066,7 @@ case $as_dir/ in
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	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.
@@ -1650,21 +2085,22 @@ case $as_dir/ in
     ;;
 esac
 done
+IFS=$as_save_IFS
 
 
 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.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # 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 path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -1674,8 +2110,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -1717,20 +2153,20 @@ echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 test "$program_prefix" != NONE &&
-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
+  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"
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
 # Double any \ or $.  echo might interpret backslashes.
 # By default was `s,x,x', remove it if useless.
 cat <<\_ACEOF >conftest.sed
 s/[\\$]/&&/g;s/;s,x,x,$//
 _ACEOF
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
+rm -f conftest.sed
 
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1745,45 +2181,60 @@ else
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    mkdir_p='$(install_sh) -d'
+    # 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.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1796,54 +2247,57 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+  { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$AWK" && break
 done
 
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
+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 \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   SET_MAKE=
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -1856,12 +2310,16 @@ else
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+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
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -1876,7 +2334,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='easytag'
- VERSION='2.1.2'
+ VERSION='2.1.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1904,7 +2362,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -1914,8 +2372,8 @@ 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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1928,32 +2386,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+  { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1966,33 +2426,47 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  STRIP=$ac_ct_STRIP
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
 else
   STRIP="$ac_cv_prog_STRIP"
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -2007,7 +2481,7 @@ 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 sv uk zh_CN"
+ALL_LINGUAS="bg cs da de el es fr he hu it ja nl pl pt_BR ro ru sr sr@Latn sv uk zh_CN"
 GETTEXT_PACKAGE=easytag
 
 
@@ -2024,8 +2498,8 @@ 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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2038,32 +2512,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2076,36 +2552,51 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&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.
+          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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2118,74 +2609,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2199,7 +2650,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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
@@ -2210,6 +2661,7 @@ do
   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.
@@ -2227,22 +2679,23 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2255,36 +2708,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2297,29 +2752,45 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
 fi
@@ -2332,21 +2803,35 @@ See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
@@ -2371,47 +2856,77 @@ ac_clean_files="$ac_clean_files a.out 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.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort.  b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions.  Remove them first so a
+# subsequent execution test works.
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link_default") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+  # 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 | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
+        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
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -2423,19 +2938,21 @@ See \`config.log' for more details." >&2;}
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
 
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2454,22 +2971,27 @@ See \`config.log' for more details." >&2;}
     fi
   fi
 fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
+
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -2480,9 +3002,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 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 | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
 	  break;;
     * ) break;;
   esac
@@ -2496,14 +3017,14 @@ See \`config.log' for more details." >&2;}
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2523,14 +3044,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  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 ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
@@ -2548,12 +3075,12 @@ fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2576,50 +3103,49 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2635,38 +3161,118 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cc_g=no
+
+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 conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$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
@@ -2682,12 +3288,12 @@ else
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_prog_cc_stdc=no
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2721,12 +3327,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
 /* 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 -std1 is added to get
+   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 -std1.  */
+   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);};
@@ -2741,205 +3352,57 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+  xno)
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
   *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+    CC="$CC $ac_cv_prog_cc_c89"
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2947,7 +3410,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 DEPDIR="${am__leading_dot}deps"
 
-          ac_config_commands="$ac_config_commands depfiles"
+ac_config_commands="$ac_config_commands depfiles"
 
 
 am_make=${MAKE-make}
@@ -2957,8 +3420,8 @@ am__doit:
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
 am__include="#"
 am__quote=
 _am_result=none
@@ -2985,22 +3448,20 @@ if test "$am__include" = "#"; then
 fi
 
 
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
 rm -f confinc confmf
 
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+# Check whether --enable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then
-  enableval="$enable_dependency_tracking"
+  enableval=$enable_dependency_tracking;
+fi
 
-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
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -3010,11 +3471,10 @@ fi
 
 
 
-
 depcc="$CC"   am_compiler_list=
 
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3078,6 +3538,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3103,13 +3564,11 @@ else
 fi
 
 fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -3120,18 +3579,22 @@ else
 fi
 
 
-ac_ext=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
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3144,36 +3607,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+  { echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$CXX" && break
   done
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+  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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3186,55 +3651,85 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$ac_ct_CXX" && break
 done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 
-  CXX=$ac_ct_CXX
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
 fi
 
-
+  fi
+fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C++ compiler version" >&5
+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3257,50 +3752,49 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
 GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3316,159 +3810,133 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$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
-for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
+	CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
+
 int
 main ()
 {
-exit (42);
+
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
+
 int
 main ()
 {
-exit (42);
+
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cxx_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
+
+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
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$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'
@@ -3477,8 +3945,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
 if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3542,6 +4010,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3567,13 +4036,11 @@ else
 fi
 
 fi
-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
   am__fastdepCXX_TRUE=
@@ -3584,13 +4051,13 @@ else
 fi
 
 
-ac_ext=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
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3620,24 +4087,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -3646,9 +4111,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3658,24 +4124,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -3686,6 +4150,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -3703,8 +4168,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -3727,24 +4192,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -3753,9 +4216,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3765,24 +4229,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -3793,6 +4255,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -3827,8 +4290,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # 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.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3850,7 +4313,7 @@ case $as_dir/ in
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	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.
@@ -3869,21 +4332,22 @@ case $as_dir/ in
     ;;
 esac
 done
+IFS=$as_save_IFS
 
 
 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.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # 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 path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3893,39 +4357,39 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
+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 \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   SET_MAKE=
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-# Check whether --enable-shared or --disable-shared was given.
+# Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
+  enableval=$enable_shared; p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
     no) enable_shared=no ;;
@@ -3944,13 +4408,13 @@ if test "${enable_shared+set}" = set; then
     esac
 else
   enable_shared=no
-fi;
+fi
+
 
 
-# Check whether --enable-static or --disable-static was given.
+# Check whether --enable-static was given.
 if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
+  enableval=$enable_static; p=${PACKAGE-default}
     case $enableval in
     yes) enable_static=yes ;;
     no) enable_static=no ;;
@@ -3969,12 +4433,12 @@ if test "${enable_static+set}" = set; then
     esac
 else
   enable_static=yes
-fi;
+fi
+
 
-# Check whether --enable-fast-install or --disable-fast-install was given.
+# Check whether --enable-fast-install was given.
 if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
+  enableval=$enable_fast_install; p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
     no) enable_fast_install=no ;;
@@ -3993,64 +4457,94 @@ if test "${enable_fast_install+set}" = set; then
     esac
 else
   enable_fast_install=yes
-fi;
+fi
+
 
 # Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
+  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 &&
   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
 build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+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
+
+
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+  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` ||
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
+fi
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
 host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
+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
+
+
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
 if test "${lt_cv_path_SED+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4105,37 +4599,184 @@ fi
 
 SED=$lt_cv_path_SED
 
-echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6
+{ echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6; }
 
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  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
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    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
+    ac_count=`expr $ac_count + 1`
+    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
+
+
+fi
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
+  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
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    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
+    ac_count=`expr $ac_count + 1`
+    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
+
+
+fi
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+
+   fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
 
 
 
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+# 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
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi;
+fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -4164,11 +4805,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
 else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4201,17 +4842,17 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+  { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4225,20 +4866,20 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
 if test "${lt_cv_ld_reload_flag+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -4255,8 +4896,8 @@ case $host_os in
     ;;
 esac
 
-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
 if test "${lt_cv_path_NM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4304,23 +4945,23 @@ else
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
 NM="$lt_cv_path_NM"
 
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
 fi
 
-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4495,8 +5136,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 esac
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+echo "${ECHO_T}$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
@@ -4514,11 +5155,11 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 compiler=$CC
 
 
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+# Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
+  enableval=$enable_libtool_lock;
+fi
 
-fi;
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
@@ -4545,7 +5186,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4548 "configure"' > conftest.$ac_ext
+  echo '#line 5189 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4630,8 +5271,8 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
 if test "${lt_cv_cc_needs_belf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4657,35 +5298,32 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   lt_cv_cc_needs_belf=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-lt_cv_cc_needs_belf=no
+	lt_cv_cc_needs_belf=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4694,8 +5332,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$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"
@@ -4732,8 +5370,8 @@ 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
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -4767,24 +5405,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -4793,9 +5429,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4805,24 +5442,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -4833,6 +5468,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -4850,8 +5486,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -4874,24 +5510,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -4900,9 +5534,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4912,24 +5547,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -4940,6 +5573,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -4962,8 +5596,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4987,35 +5621,31 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_stdc=no
+	ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+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.
@@ -5071,6 +5701,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* 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))
@@ -5090,18 +5721,27 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -5114,12 +5754,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -5142,9 +5784,9 @@ 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=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -5158,38 +5800,35 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_Header=no"
+	eval "$as_ac_Header=no"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -5204,18 +5843,19 @@ done
 for ac_header in dlfcn.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5226,41 +5866,37 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5269,24 +5905,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5294,9 +5928,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -5320,25 +5955,19 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to the easytag lists.  ##
-## ---------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -5355,13 +5984,13 @@ done
 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=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
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5391,24 +6020,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -5417,9 +6044,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5429,24 +6057,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -5457,6 +6083,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -5474,8 +6101,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -5498,24 +6125,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -5524,9 +6149,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5536,24 +6162,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -5564,6 +6188,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -5579,7 +6204,7 @@ See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-ac_ext=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'
@@ -5593,12 +6218,12 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
   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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5611,36 +6236,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 F77=$ac_cv_prog_F77
 if test -n "$F77"; then
-  echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6
+  { echo "$as_me:$LINENO: result: $F77" >&5
+echo "${ECHO_T}$F77" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$F77" && break
   done
 fi
 if test -z "$F77"; then
   ac_ct_F77=$F77
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5653,48 +6280,78 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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_F77="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_F77=$ac_cv_prog_ac_ct_F77
 if test -n "$ac_ct_F77"; then
-  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+echo "${ECHO_T}$ac_ct_F77" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$ac_ct_F77" && break
 done
 
-  F77=$ac_ct_F77
+  if test "x$ac_ct_F77" = x; then
+    F77=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    F77=$ac_ct_F77
+  fi
 fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5683:" \
-     "checking for Fortran 77 compiler version" >&5
+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
@@ -5704,8 +6361,8 @@ rm -f a.out
 # input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=$ac_ext
 ac_ext=F
-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
 if test "${ac_cv_f77_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5718,46 +6375,42 @@ else
       end
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
 ac_ext=$ac_save_ext
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_f77_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5768,39 +6421,35 @@ cat >conftest.$ac_ext <<_ACEOF
       end
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_f77_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_f77_g=no
+	ac_cv_prog_f77_g=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
 if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
@@ -5829,8 +6478,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 
 # find the maximum length of command line arguments
-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
 if test "${lt_cv_sys_max_cmd_len+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5938,19 +6587,19 @@ else
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
+  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
 else
-  echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+  { echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6; }
 fi
 
 
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6154,15 +6803,15 @@ 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
-  echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
+  { echo "$as_me:$LINENO: result: failed" >&5
+echo "${ECHO_T}failed" >&6; }
 else
-  echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+  { echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6; }
 fi
 
-echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
 if test "${lt_cv_objdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6176,8 +6825,8 @@ else
 fi
 rmdir .libs 2>/dev/null
 fi
-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+echo "${ECHO_T}$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
@@ -6228,8 +6877,8 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
 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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6242,32 +6891,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
+  { echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6280,27 +6931,41 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  AR=$ac_ct_AR
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
 else
   AR="$ac_cv_prog_AR"
 fi
@@ -6308,8 +6973,8 @@ fi
 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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6322,32 +6987,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+  { echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6360,27 +7027,41 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  RANLIB=$ac_ct_RANLIB
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
@@ -6388,8 +7069,8 @@ fi
 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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6402,32 +7083,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+  { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6440,27 +7123,41 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  STRIP=$ac_ct_STRIP
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
 else
   STRIP="$ac_cv_prog_STRIP"
 fi
@@ -6519,8 +7216,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6572,17 +7269,17 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for file" >&5
+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6634,11 +7331,11 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   else
@@ -6653,21 +7350,21 @@ esac
 enable_dlopen=no
 enable_win32_dll=no
 
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+# Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
+  enableval=$enable_libtool_lock;
+fi
 
-fi;
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 
-# Check whether --with-pic or --without-pic was given.
+# Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
+  withval=$with_pic; pic_mode="$withval"
 else
   pic_mode=default
-fi;
+fi
+
 test -z "$pic_mode" && pic_mode=default
 
 # Use C for the default configuration in the libtool script
@@ -6725,8 +7422,8 @@ if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6743,11 +7440,11 @@ else
    -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:6746: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7443: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6750: \$? = $ac_status" >&5
+   echo "$as_me:7447: \$? = $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.
@@ -6760,8 +7457,8 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$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"
@@ -6775,8 +7472,8 @@ lt_prog_compiler_wl=
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -6985,16 +7682,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     esac
   fi
 
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
 
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_pic_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -7011,11 +7708,11 @@ else
    -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:7014: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7711: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7018: \$? = $ac_status" >&5
+   echo "$as_me:7715: \$? = $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.
@@ -7028,8 +7725,8 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
@@ -7056,8 +7753,8 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_static_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -7084,8 +7781,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
 
 if test x"$lt_prog_compiler_static_works" = xyes; then
     :
@@ -7094,8 +7791,8 @@ else
 fi
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -7115,11 +7812,11 @@ else
    -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:7118: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7815: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7122: \$? = $ac_status" >&5
+   echo "$as_me:7819: \$? = $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
@@ -7141,23 +7838,23 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+echo "${ECHO_T}$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
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&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
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+  { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
   if test "$hard_links" = no; then
     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -7167,8 +7864,8 @@ else
   need_locks=no
 fi
 
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -7583,27 +8280,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -7614,8 +8307,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -7644,27 +8339,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -7675,8 +8366,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -8125,8 +8818,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
 #
@@ -8146,8 +8839,8 @@ x|xyes)
       # 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.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
@@ -8184,16 +8877,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6
+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -8584,7 +9277,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 8587 "configure"' > conftest.$ac_ext
+    echo '#line 9280 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8603,7 +9296,7 @@ linux*)
 
   # 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/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    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/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -8801,8 +9494,8 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -8810,8 +9503,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var" || \
@@ -8835,8 +9528,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -8849,29 +9542,29 @@ fi
 
 striplib=
 old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&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"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}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"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+         { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
        else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
        ;;
    *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
     ;;
   esac
 fi
@@ -8903,8 +9596,8 @@ else
 
   darwin*)
   # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8917,56 +9610,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dlopen ();
 int
 main ()
 {
-dlopen ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dl_dlopen=no
+	ac_cv_lib_dl_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
@@ -8980,8 +9670,8 @@ fi
    ;;
 
   *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9008,73 +9698,64 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef shl_load
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char shl_load ();
 /* 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_shl_load) || defined (__stub___shl_load)
+#if defined __stub_shl_load || defined __stub___shl_load
 choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != shl_load;
+return shl_load ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_shl_load=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_shl_load=no
+	ac_cv_func_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
 if test $ac_cv_func_shl_load = yes; then
   lt_cv_dlopen="shl_load"
 else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9087,61 +9768,58 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char shl_load ();
 int
 main ()
 {
-shl_load ();
+return shl_load ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_shl_load=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dld_shl_load=no
+	ac_cv_lib_dld_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
 if test $ac_cv_lib_dld_shl_load = yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9168,73 +9846,64 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef dlopen
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dlopen ();
 /* 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_dlopen) || defined (__stub___dlopen)
+#if defined __stub_dlopen || defined __stub___dlopen
 choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != dlopen;
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_dlopen=no
+	ac_cv_func_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
 if test $ac_cv_func_dlopen = yes; then
   lt_cv_dlopen="dlopen"
 else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9247,61 +9916,58 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dlopen ();
 int
 main ()
 {
-dlopen ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dl_dlopen=no
+	ac_cv_lib_dl_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9314,61 +9980,58 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dlopen ();
 int
 main ()
 {
-dlopen ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_svld_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_svld_dlopen=no
+	ac_cv_lib_svld_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
 if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9381,56 +10044,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dld_link ();
 int
 main ()
 {
-dld_link ();
+return dld_link ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_dld_link=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dld_dld_link=no
+	ac_cv_lib_dld_dld_link=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
 if test $ac_cv_lib_dld_dld_link = yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 fi
@@ -9470,8 +10130,8 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9481,7 +10141,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9484 "configure"
+#line 10144 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9565,13 +10225,13 @@ rm -fr conftest*
 
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$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\"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9581,7 +10241,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9584 "configure"
+#line 10244 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9665,8 +10325,8 @@ rm -fr conftest*
 
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -9688,13 +10348,13 @@ fi
 
 
 # Report which library types will actually be built
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
 
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -9714,15 +10374,15 @@ aix4* | aix5*)
   fi
     ;;
 esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
 
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
+{ echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -9912,9 +10572,6 @@ CC=$lt_compiler
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -10048,11 +10705,11 @@ striplib=$lt_striplib
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -10064,7 +10721,7 @@ postdeps=$lt_postdeps
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -10144,7 +10801,7 @@ variables_saved_for_relink="$variables_saved_for_relink"
 link_all_deplibs=$link_all_deplibs
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+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
@@ -10217,11 +10874,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 CC="$lt_save_CC"
 
 
-# Check whether --with-tags or --without-tags was given.
+# Check whether --with-tags was given.
 if test "${with_tags+set}" = set; then
-  withval="$with_tags"
-  tagnames="$withval"
-fi;
+  withval=$with_tags; tagnames="$withval"
+fi
+
 
 if test -f "$ltmain" && test -n "$tagnames"; then
   if test ! -f "${ofile}"; then
@@ -10275,7 +10932,7 @@ echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
 	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=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'
@@ -10394,18 +11051,18 @@ if test "$GXX" = yes; then
   # Set up default GNU C++ configuration
 
 
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+# 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
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi;
+fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -10434,11 +11091,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
 else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10471,17 +11128,17 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+  { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -10495,8 +11152,8 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -10546,8 +11203,8 @@ else
 fi
 
 # PORTME: fill in a description of your system's C++ link characteristics
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 ld_shlibs_CXX=yes
 case $host_os in
   aix3*)
@@ -10659,27 +11316,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -10690,8 +11343,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -10721,27 +11376,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -10752,8 +11403,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -11484,8 +12137,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ld_shlibs_CXX=no
     ;;
 esac
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 GCC_CXX="$GXX"
@@ -11624,8 +12277,8 @@ lt_prog_compiler_wl_CXX=
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -11898,16 +12551,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     esac
   fi
 
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
 
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11924,11 +12577,11 @@ else
    -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:11927: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12580: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11931: \$? = $ac_status" >&5
+   echo "$as_me:12584: \$? = $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.
@@ -11941,8 +12594,8 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
 
 if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
@@ -11969,8 +12622,8 @@ esac
 # 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\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11997,8 +12650,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
 
 if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
     :
@@ -12007,8 +12660,8 @@ else
 fi
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12028,11 +12681,11 @@ else
    -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:12031: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12684: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12035: \$? = $ac_status" >&5
+   echo "$as_me:12688: \$? = $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
@@ -12054,23 +12707,23 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+echo "${ECHO_T}$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
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&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
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+  { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
   if test "$hard_links" = no; then
     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -12080,8 +12733,8 @@ else
   need_locks=no
 fi
 
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -12105,8 +12758,8 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   ;;
   esac
 
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 #
@@ -12126,8 +12779,8 @@ x|xyes)
       # 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.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
@@ -12164,16 +12817,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -12564,7 +13217,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 12567 "configure"' > conftest.$ac_ext
+    echo '#line 13220 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -12583,7 +13236,7 @@ linux*)
 
   # 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/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    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/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -12781,8 +13434,8 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12790,8 +13443,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
    test -n "$runpath_var_CXX" || \
@@ -12815,8 +13468,8 @@ else
   # directories.
   hardcode_action_CXX=unsupported
 fi
-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+echo "${ECHO_T}$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink; then
   # Fast installation is not supported
@@ -12968,9 +13621,6 @@ CC=$lt_compiler_CXX
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_CXX
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -13104,11 +13754,11 @@ striplib=$lt_striplib
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_CXX
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_CXX
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -13120,7 +13770,7 @@ postdeps=$lt_postdeps_CXX
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -13200,7 +13850,7 @@ variables_saved_for_relink="$variables_saved_for_relink"
 link_all_deplibs=$link_all_deplibs_CXX
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+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
@@ -13344,13 +13994,13 @@ done
 cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
 
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -13369,15 +14019,15 @@ aix4* | aix5*)
   fi
   ;;
 esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
 
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
+{ echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
 
 GCC_F77="$G77"
 LD_F77="$LD"
@@ -13386,8 +14036,8 @@ lt_prog_compiler_wl_F77=
 lt_prog_compiler_pic_F77=
 lt_prog_compiler_static_F77=
 
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_F77='-Wl,'
@@ -13596,16 +14246,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     esac
   fi
 
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_F77"; then
 
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -13622,11 +14272,11 @@ else
    -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:13625: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14275: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13629: \$? = $ac_status" >&5
+   echo "$as_me:14279: \$? = $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.
@@ -13639,8 +14289,8 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
 
 if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
@@ -13667,8 +14317,8 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_static_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -13695,8 +14345,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
 
 if test x"$lt_prog_compiler_static_works_F77" = xyes; then
     :
@@ -13705,8 +14355,8 @@ else
 fi
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -13726,11 +14376,11 @@ else
    -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:13729: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14379: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13733: \$? = $ac_status" >&5
+   echo "$as_me:14383: \$? = $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
@@ -13752,23 +14402,23 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&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
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+  { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
   if test "$hard_links" = no; then
     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -13778,8 +14428,8 @@ else
   need_locks=no
 fi
 
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 
   runpath_var=
   allow_undefined_flag_F77=
@@ -14184,27 +14834,23 @@ _LT_EOF
       end
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -14215,8 +14861,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -14235,27 +14883,23 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       end
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -14266,8 +14910,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -14716,8 +15362,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+echo "${ECHO_T}$ld_shlibs_F77" >&6; }
 test "$ld_shlibs_F77" = no && can_build_shared=no
 
 #
@@ -14737,8 +15383,8 @@ x|xyes)
       # 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.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
@@ -14775,16 +15421,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -15175,7 +15821,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 15178 "configure"' > conftest.$ac_ext
+    echo '#line 15824 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -15194,7 +15840,7 @@ linux*)
 
   # 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/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    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/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -15392,8 +16038,8 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -15401,8 +16047,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 hardcode_action_F77=
 if test -n "$hardcode_libdir_flag_spec_F77" || \
    test -n "$runpath_var_F77" || \
@@ -15426,8 +16072,8 @@ else
   # directories.
   hardcode_action_F77=unsupported
 fi
-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+echo "${ECHO_T}$hardcode_action_F77" >&6; }
 
 if test "$hardcode_action_F77" = relink; then
   # Fast installation is not supported
@@ -15579,9 +16225,6 @@ CC=$lt_compiler_F77
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_F77
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -15715,11 +16358,11 @@ striplib=$lt_striplib
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_F77
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_F77
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -15731,7 +16374,7 @@ postdeps=$lt_postdeps_F77
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -15811,7 +16454,7 @@ variables_saved_for_relink="$variables_saved_for_relink"
 link_all_deplibs=$link_all_deplibs_F77
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+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
@@ -15867,7 +16510,6 @@ CC="$lt_save_CC"
 	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
 
 
-
 # Source file extension for Java test sources.
 ac_ext=java
 
@@ -15935,8 +16577,8 @@ if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -15953,11 +16595,11 @@ else
    -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:15956: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16598: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15960: \$? = $ac_status" >&5
+   echo "$as_me:16602: \$? = $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.
@@ -15970,8 +16612,8 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
@@ -15985,8 +16627,8 @@ lt_prog_compiler_wl_GCJ=
 lt_prog_compiler_pic_GCJ=
 lt_prog_compiler_static_GCJ=
 
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_GCJ='-Wl,'
@@ -16195,16 +16837,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     esac
   fi
 
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_GCJ"; then
 
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16221,11 +16863,11 @@ else
    -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:16224: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16866: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16228: \$? = $ac_status" >&5
+   echo "$as_me:16870: \$? = $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.
@@ -16238,8 +16880,8 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
 
 if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
@@ -16266,8 +16908,8 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16294,8 +16936,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
 
 if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
     :
@@ -16304,8 +16946,8 @@ else
 fi
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16325,11 +16967,11 @@ else
    -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:16328: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16970: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16332: \$? = $ac_status" >&5
+   echo "$as_me:16974: \$? = $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
@@ -16351,23 +16993,23 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&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
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+  { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
   if test "$hard_links" = no; then
     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -16377,8 +17019,8 @@ else
   need_locks=no
 fi
 
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 
   runpath_var=
   allow_undefined_flag_GCJ=
@@ -16793,27 +17435,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -16824,8 +17462,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -16854,27 +17494,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -16885,8 +17521,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -17335,8 +17973,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
 test "$ld_shlibs_GCJ" = no && can_build_shared=no
 
 #
@@ -17356,8 +17994,8 @@ x|xyes)
       # 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.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
@@ -17394,16 +18032,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -17794,7 +18432,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 17797 "configure"' > conftest.$ac_ext
+    echo '#line 18435 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -17813,7 +18451,7 @@ linux*)
 
   # 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/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    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/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -18011,8 +18649,8 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -18020,8 +18658,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 hardcode_action_GCJ=
 if test -n "$hardcode_libdir_flag_spec_GCJ" || \
    test -n "$runpath_var_GCJ" || \
@@ -18045,8 +18683,8 @@ else
   # directories.
   hardcode_action_GCJ=unsupported
 fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
 
 if test "$hardcode_action_GCJ" = relink; then
   # Fast installation is not supported
@@ -18198,9 +18836,6 @@ CC=$lt_compiler_GCJ
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_GCJ
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -18334,11 +18969,11 @@ striplib=$lt_striplib
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_GCJ
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_GCJ
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -18350,7 +18985,7 @@ postdeps=$lt_postdeps_GCJ
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -18430,7 +19065,7 @@ variables_saved_for_relink="$variables_saved_for_relink"
 link_all_deplibs=$link_all_deplibs_GCJ
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+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
@@ -18485,7 +19120,6 @@ CC="$lt_save_CC"
       RC)
 
 
-
 # Source file extension for RC test sources.
 ac_ext=rc
 
@@ -18682,9 +19316,6 @@ CC=$lt_compiler_RC
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_RC
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -18818,11 +19449,11 @@ striplib=$lt_striplib
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_RC
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_RC
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -18834,7 +19465,7 @@ postdeps=$lt_postdeps_RC
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -18914,7 +19545,7 @@ variables_saved_for_relink="$variables_saved_for_relink"
 link_all_deplibs=$link_all_deplibs_RC
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+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
@@ -19019,13 +19650,12 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
-echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
 if test "${ac_cv_search_strerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_func_search_save_LIBS=$LIBS
-ac_cv_search_strerror=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -19033,132 +19663,88 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char strerror ();
 int
 main ()
 {
-strerror ();
+return strerror ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+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
+  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="none required"
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_search_strerror=$ac_res
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_strerror" = no; then
-  for ac_lib in cposix; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char strerror ();
-int
-main ()
-{
-strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_strerror+set}" = set; then
+  break
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
+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
-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_strerror" >&6
-if test "$ac_cv_search_strerror" != no; then
-  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+echo "${ECHO_T}$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
 
-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+    # Check whether --enable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 else
   USE_MAINTAINER_MODE=no
-fi;
-  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-
+fi
 
-if test $USE_MAINTAINER_MODE = yes; then
+  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
   MAINTAINER_MODE_FALSE='#'
 else
@@ -19171,71 +19757,71 @@ fi
 
 
 
-# Check whether --enable-mp3 or --disable-mp3 was given.
+# Check whether --enable-mp3 was given.
 if test "${enable_mp3+set}" = set; then
-  enableval="$enable_mp3"
-
+  enableval=$enable_mp3;
 else
   enable_mp3=yes
-fi;
+fi
 
-# Check whether --enable-id3v23 or --disable-id3v23 was given.
-if test "${enable_id3v23+set}" = set; then
-  enableval="$enable_id3v23"
 
+# Check whether --enable-id3v23 was given.
+if test "${enable_id3v23+set}" = set; then
+  enableval=$enable_id3v23;
 else
   enable_id3v23=yes
-fi;
+fi
 
-# Check whether --enable-ogg or --disable-ogg was given.
-if test "${enable_ogg+set}" = set; then
-  enableval="$enable_ogg"
 
+# Check whether --enable-ogg was given.
+if test "${enable_ogg+set}" = set; then
+  enableval=$enable_ogg;
 else
   enable_ogg=yes
-fi;
+fi
 
-# Check whether --enable-speex or --disable-speex was given.
-if test "${enable_speex+set}" = set; then
-  enableval="$enable_speex"
 
+# Check whether --enable-speex was given.
+if test "${enable_speex+set}" = set; then
+  enableval=$enable_speex;
 else
   enable_speex=yes
-fi;
+fi
 
-# Check whether --enable-flac or --disable-flac was given.
-if test "${enable_flac+set}" = set; then
-  enableval="$enable_flac"
 
+# Check whether --enable-flac was given.
+if test "${enable_flac+set}" = set; then
+  enableval=$enable_flac;
 else
   enable_flac=yes
-fi;
+fi
 
-# Check whether --enable-mp4 or --disable-mp4 was given.
-if test "${enable_mp4+set}" = set; then
-  enableval="$enable_mp4"
 
+# Check whether --enable-mp4 was given.
+if test "${enable_mp4+set}" = set; then
+  enableval=$enable_mp4;
 else
   enable_mp4=yes
-fi;
+fi
 
-# Check whether --enable-wavpack or --disable-wavpack was given.
-if test "${enable_wavpack+set}" = set; then
-  enableval="$enable_wavpack"
 
+# Check whether --enable-wavpack was given.
+if test "${enable_wavpack+set}" = set; then
+  enableval=$enable_wavpack;
 else
   enable_wavpack=yes
-fi;
+fi
 
 
 
-# Check whether --enable-glibtest or --disable-glibtest was given.
-if test "${enable_glibtest+set}" = set; then
-  enableval="$enable_glibtest"
 
+# Check whether --enable-glibtest was given.
+if test "${enable_glibtest+set}" = set; then
+  enableval=$enable_glibtest;
 else
   enable_glibtest=yes
-fi;
+fi
+
 
   pkg_config_args=glib-2.0
   for module in .
@@ -19262,8 +19848,8 @@ 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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -19278,34 +19864,35 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -19320,28 +19907,42 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  PKG_CONFIG=$ac_pt_PKG_CONFIG
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
 else
   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
@@ -19349,14 +19950,14 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.7
-	echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+		{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	else
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+		{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 		PKG_CONFIG=""
 	fi
 
@@ -19370,8 +19971,8 @@ fi
   fi
 
   min_glib_version=2.8.0
-  echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
-echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
+echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; }
 
   if test x$PKG_CONFIG != xno ; then
     ## don't try to run the test against uninstalled libtool libs
@@ -19489,13 +20090,22 @@ main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -19508,19 +20118,21 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 no_glib=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_glib" = x ; then
-     echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
-echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6
+     { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
+echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
      :
   else
-     echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+     { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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/"
@@ -19552,27 +20164,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; 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"
@@ -19586,10 +20194,11 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- echo "*** The test program failed to compile or link. See the file config.log for the"
+	 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 conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -19611,13 +20220,13 @@ echo "$as_me: error: *** GLIB >= 2.8.0 not installed! ***" >&2;}
 
   rm -f conf.glibtest
 
-# Check whether --enable-gtktest or --disable-gtktest was given.
+# Check whether --enable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
-  enableval="$enable_gtktest"
-
+  enableval=$enable_gtktest;
 else
   enable_gtktest=yes
-fi;
+fi
+
 
   pkg_config_args=gtk+-2.0
   for module in .
@@ -19633,8 +20242,8 @@ fi;
 
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -19649,29 +20258,30 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
+
   if test x$PKG_CONFIG != xno ; then
     if pkg-config --atleast-pkgconfig-version 0.7 ; then
       :
@@ -19685,8 +20295,8 @@ fi
   fi
 
   min_gtk_version=2.4.1
-  echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
+echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; }
 
   if test x$PKG_CONFIG != xno ; then
     ## don't try to run the test against uninstalled libtool libs
@@ -19800,13 +20410,22 @@ main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -19819,19 +20438,21 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 no_gtk=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
-     echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
-echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6
+     { echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
+echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
      :
   else
-     echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+     { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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"
@@ -19863,27 +20484,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; 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"
@@ -19897,10 +20514,11 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- echo "*** The test program failed to compile or link. See the file config.log for the"
+	 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 conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -19918,8 +20536,8 @@ echo "$as_me: error: *** GTK >= 2.4.1 not installed! ***" >&2;}
 
 
 pkg_failed=no
-echo "$as_me:$LINENO: checking for GTK" >&5
-echo $ECHO_N "checking for GTK... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for GTK" >&5
+echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GTK_CFLAGS"; then
@@ -20023,15 +20641,15 @@ See \`config.log' for more details." >&2;}
 else
 	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
 	GTK_LIBS=$pkg_cv_GTK_LIBS
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	:
 fi
 
 
 
-echo "$as_me:$LINENO: checking for recv in -lsocket" >&5
-echo $ECHO_N "checking for recv in -lsocket... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for recv in -lsocket" >&5
+echo $ECHO_N "checking for recv in -lsocket... $ECHO_C" >&6; }
 if test "${ac_cv_lib_socket_recv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20044,56 +20662,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char recv ();
 int
 main ()
 {
-recv ();
+return recv ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_socket_recv=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_socket_recv=no
+	ac_cv_lib_socket_recv=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_recv" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_recv" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_recv" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_recv" >&6; }
 if test $ac_cv_lib_socket_recv = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSOCKET 1
@@ -20109,8 +20724,8 @@ fi
 if test "x$enable_ogg" = "xyes" -o "x$enable_flac" = "xyes"; then
 
 pkg_failed=no
-echo "$as_me:$LINENO: checking for OGG" >&5
-echo $ECHO_N "checking for OGG... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for OGG" >&5
+echo $ECHO_N "checking for OGG... $ECHO_C" >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$OGG_CFLAGS"; then
@@ -20166,16 +20781,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$OGG_PKG_ERRORS" >&5
 
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 ogg_available=no
 elif test $pkg_failed = untried; then
 	ogg_available=no
 else
 	OGG_CFLAGS=$pkg_cv_OGG_CFLAGS
 	OGG_LIBS=$pkg_cv_OGG_LIBS
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	:
 fi
     if test "x$ogg_available" = "xno"; then
@@ -20185,8 +20800,8 @@ fi
     fi
 
 pkg_failed=no
-echo "$as_me:$LINENO: checking for VORBIS" >&5
-echo $ECHO_N "checking for VORBIS... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for VORBIS" >&5
+echo $ECHO_N "checking for VORBIS... $ECHO_C" >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$VORBIS_CFLAGS"; then
@@ -20242,16 +20857,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$VORBIS_PKG_ERRORS" >&5
 
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 ogg_available=no
 elif test $pkg_failed = untried; then
 	ogg_available=no
 else
 	VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS
 	VORBIS_LIBS=$pkg_cv_VORBIS_LIBS
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	:
 fi
     if test "x$ogg_available" = "xno"; then
@@ -20260,8 +20875,8 @@ fi
         echo "***"
     fi
 
-echo "$as_me:$LINENO: checking for cos in -lm" >&5
-echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for cos in -lm" >&5
+echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6; }
 if test "${ac_cv_lib_m_cos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20274,56 +20889,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char cos ();
 int
 main ()
 {
-cos ();
+return cos ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_m_cos=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_m_cos=no
+	ac_cv_lib_m_cos=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
-echo "${ECHO_T}$ac_cv_lib_m_cos" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
+echo "${ECHO_T}$ac_cv_lib_m_cos" >&6; }
 if test $ac_cv_lib_m_cos = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
@@ -20333,8 +20945,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for ogg_sync_init in -logg" >&5
-echo $ECHO_N "checking for ogg_sync_init in -logg... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ogg_sync_init in -logg" >&5
+echo $ECHO_N "checking for ogg_sync_init in -logg... $ECHO_C" >&6; }
 if test "${ac_cv_lib_ogg_ogg_sync_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20347,56 +20959,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char ogg_sync_init ();
 int
 main ()
 {
-ogg_sync_init ();
+return ogg_sync_init ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_ogg_ogg_sync_init=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_ogg_ogg_sync_init=no
+	ac_cv_lib_ogg_ogg_sync_init=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ogg_ogg_sync_init" >&5
-echo "${ECHO_T}$ac_cv_lib_ogg_ogg_sync_init" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ogg_ogg_sync_init" >&5
+echo "${ECHO_T}$ac_cv_lib_ogg_ogg_sync_init" >&6; }
 if test $ac_cv_lib_ogg_ogg_sync_init = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBOGG 1
@@ -20409,8 +21018,8 @@ else
 fi
 
 
-echo "$as_me:$LINENO: checking for vorbis_comment_init in -lvorbis" >&5
-echo $ECHO_N "checking for vorbis_comment_init in -lvorbis... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for vorbis_comment_init in -lvorbis" >&5
+echo $ECHO_N "checking for vorbis_comment_init in -lvorbis... $ECHO_C" >&6; }
 if test "${ac_cv_lib_vorbis_vorbis_comment_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20423,56 +21032,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char vorbis_comment_init ();
 int
 main ()
 {
-vorbis_comment_init ();
+return vorbis_comment_init ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_vorbis_vorbis_comment_init=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_vorbis_vorbis_comment_init=no
+	ac_cv_lib_vorbis_vorbis_comment_init=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_vorbis_vorbis_comment_init" >&5
-echo "${ECHO_T}$ac_cv_lib_vorbis_vorbis_comment_init" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_vorbis_vorbis_comment_init" >&5
+echo "${ECHO_T}$ac_cv_lib_vorbis_vorbis_comment_init" >&6; }
 if test $ac_cv_lib_vorbis_vorbis_comment_init = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBVORBIS 1
@@ -20485,8 +21091,8 @@ else
 fi
 
 
-echo "$as_me:$LINENO: checking for ov_open in -lvorbisfile" >&5
-echo $ECHO_N "checking for ov_open in -lvorbisfile... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ov_open in -lvorbisfile" >&5
+echo $ECHO_N "checking for ov_open in -lvorbisfile... $ECHO_C" >&6; }
 if test "${ac_cv_lib_vorbisfile_ov_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20499,56 +21105,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char ov_open ();
 int
 main ()
 {
-ov_open ();
+return ov_open ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_vorbisfile_ov_open=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_vorbisfile_ov_open=no
+	ac_cv_lib_vorbisfile_ov_open=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisfile_ov_open" >&5
-echo "${ECHO_T}$ac_cv_lib_vorbisfile_ov_open" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisfile_ov_open" >&5
+echo "${ECHO_T}$ac_cv_lib_vorbisfile_ov_open" >&6; }
 if test $ac_cv_lib_vorbisfile_ov_open = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBVORBISFILE 1
@@ -20562,20 +21165,20 @@ fi
 
 fi
 
-echo "$as_me:$LINENO: checking for Ogg Vorbis file support" >&5
-echo $ECHO_N "checking for Ogg Vorbis file support... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for Ogg Vorbis file support" >&5
+echo $ECHO_N "checking for Ogg Vorbis file support... $ECHO_C" >&6; }
 if test "x$enable_ogg" = "xyes"; then
     if test "x$ogg_available" = "xno"; then
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
         enable_ogg="no"
         echo "***"
         echo "*** Warning: Ogg Vorbis file support disabled"
         echo "*** (Install libogg and libvorbis libraries to enable it)"
         echo "***"
     else
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define ENABLE_OGG 1
@@ -20593,8 +21196,8 @@ fi
 
 if test "x$enable_speex" = "xyes"; then
 
-echo "$as_me:$LINENO: checking for cos in -lm" >&5
-echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for cos in -lm" >&5
+echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6; }
 if test "${ac_cv_lib_m_cos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20607,56 +21210,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char cos ();
 int
 main ()
 {
-cos ();
+return cos ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_m_cos=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_m_cos=no
+	ac_cv_lib_m_cos=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
-echo "${ECHO_T}$ac_cv_lib_m_cos" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
+echo "${ECHO_T}$ac_cv_lib_m_cos" >&6; }
 if test $ac_cv_lib_m_cos = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
@@ -20666,8 +21266,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for speex_packet_to_header in -lspeex" >&5
-echo $ECHO_N "checking for speex_packet_to_header in -lspeex... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for speex_packet_to_header in -lspeex" >&5
+echo $ECHO_N "checking for speex_packet_to_header in -lspeex... $ECHO_C" >&6; }
 if test "${ac_cv_lib_speex_speex_packet_to_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20680,56 +21280,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char speex_packet_to_header ();
 int
 main ()
 {
-speex_packet_to_header ();
+return speex_packet_to_header ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_speex_speex_packet_to_header=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_speex_speex_packet_to_header=no
+	ac_cv_lib_speex_speex_packet_to_header=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_speex_speex_packet_to_header" >&5
-echo "${ECHO_T}$ac_cv_lib_speex_speex_packet_to_header" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_speex_speex_packet_to_header" >&5
+echo "${ECHO_T}$ac_cv_lib_speex_speex_packet_to_header" >&6; }
 if test $ac_cv_lib_speex_speex_packet_to_header = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSPEEX 1
@@ -20742,27 +21339,27 @@ else
 fi
 
 
-    echo "$as_me:$LINENO: checking for Speex file support" >&5
-echo $ECHO_N "checking for Speex file support... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for Speex file support" >&5
+echo $ECHO_N "checking for Speex file support... $ECHO_C" >&6; }
     if test "x$speex_available" = "xno"; then
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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$ogg_available" = "xno"; then
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define ENABLE_SPEEX 1
@@ -20770,10 +21367,10 @@ _ACEOF
 
     fi
 else
-    echo "$as_me:$LINENO: checking for Speex file support" >&5
-echo $ECHO_N "checking for Speex file support... $ECHO_C" >&6
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    { echo "$as_me:$LINENO: checking for Speex file support" >&5
+echo $ECHO_N "checking for Speex file support... $ECHO_C" >&6; }
+    { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
     echo "***"
     echo "*** Speex file support disabled on commandline"
     echo "*** (Install speex, libogg and libvorbis libraries, and use --enable-speex to enable it)"
@@ -20784,8 +21381,8 @@ fi
 
 if test "x$enable_flac" = "xyes"; then
 
-echo "$as_me:$LINENO: checking for cos in -lm" >&5
-echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for cos in -lm" >&5
+echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6; }
 if test "${ac_cv_lib_m_cos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20798,56 +21395,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char cos ();
 int
 main ()
 {
-cos ();
+return cos ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_m_cos=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_m_cos=no
+	ac_cv_lib_m_cos=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
-echo "${ECHO_T}$ac_cv_lib_m_cos" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
+echo "${ECHO_T}$ac_cv_lib_m_cos" >&6; }
 if test $ac_cv_lib_m_cos = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
@@ -20857,8 +21451,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for FLAC__metadata_simple_iterator_new in -lFLAC" >&5
-echo $ECHO_N "checking for FLAC__metadata_simple_iterator_new in -lFLAC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for FLAC__metadata_simple_iterator_new in -lFLAC" >&5
+echo $ECHO_N "checking for FLAC__metadata_simple_iterator_new in -lFLAC... $ECHO_C" >&6; }
 if test "${ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20871,56 +21465,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char FLAC__metadata_simple_iterator_new ();
 int
 main ()
 {
-FLAC__metadata_simple_iterator_new ();
+return FLAC__metadata_simple_iterator_new ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new=no
+	ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new" >&5
-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new" >&5
+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new" >&6; }
 if test $ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBFLAC 1
@@ -20933,27 +21524,27 @@ else
 fi
 
 
-    echo "$as_me:$LINENO: checking for FLAC file support" >&5
-echo $ECHO_N "checking for FLAC file support... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for FLAC file support" >&5
+echo $ECHO_N "checking for FLAC file support... $ECHO_C" >&6; }
     if test "x$flac_available" = "xno"; then
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define ENABLE_FLAC 1
@@ -20961,10 +21552,10 @@ _ACEOF
 
     fi
 else
-    echo "$as_me:$LINENO: checking for FLAC file support" >&5
-echo $ECHO_N "checking for FLAC file support... $ECHO_C" >&6
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    { echo "$as_me:$LINENO: checking for FLAC file support" >&5
+echo $ECHO_N "checking for FLAC file support... $ECHO_C" >&6; }
+    { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
     echo "***"
     echo "*** FLAC file support disabled on commandline"
     echo "*** (Install libflac, libogg and libvorbis libraries, and use --enable-flac to enable it)"
@@ -20976,8 +21567,8 @@ if test "x$enable_flac" = "xyes"; then
     CFLAGS_SAVE="$CFLAGS"
     LIBS="$LIBS $LIBFLAC_LIBS"
     CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
-    echo "$as_me:$LINENO: checking for libFLAC version" >&5
-echo $ECHO_N "checking for libFLAC version... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for libFLAC version" >&5
+echo $ECHO_N "checking for libFLAC version... $ECHO_C" >&6; }
         if test "$cross_compiling" = yes; then
   echo $ac_n "cross compiling; assuming ${LIBFLAC_MAJOR}.${LIBFLAC_MINOR}.${LIBFLAC_PATCH} $ac_c"
 else
@@ -21011,13 +21602,22 @@ main (void)
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -21031,8 +21631,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { echo "$as_me:$LINENO: WARNING: could not determine libFLAC version" >&5
 echo "$as_me: WARNING: could not determine libFLAC version" >&2;}
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
     LIBS="$LIBS_SAVE"
     CFLAGS="$CFLAGS_SAVE"
     LIBFLAC_VERSION="(flac-$LIBFLAC_MAJOR.$LIBFLAC_MINOR.$LIBFLAC_PATCH)"
@@ -21055,20 +21657,20 @@ _ACEOF
 
 
 if test "x$enable_mp3" = "xyes"; then
-    echo "$as_me:$LINENO: checking for MP3 file support" >&5
-echo $ECHO_N "checking for MP3 file support... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for MP3 file support" >&5
+echo $ECHO_N "checking for MP3 file support... $ECHO_C" >&6; }
     if test "${ac_cv_header_id3tag_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for id3tag.h" >&5
-echo $ECHO_N "checking for id3tag.h... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for id3tag.h" >&5
+echo $ECHO_N "checking for id3tag.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_id3tag_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5
-echo "${ECHO_T}$ac_cv_header_id3tag_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5
+echo "${ECHO_T}$ac_cv_header_id3tag_h" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking id3tag.h usability" >&5
-echo $ECHO_N "checking id3tag.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking id3tag.h usability" >&5
+echo $ECHO_N "checking id3tag.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -21079,41 +21681,37 @@ $ac_includes_default
 #include <id3tag.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking id3tag.h presence" >&5
-echo $ECHO_N "checking id3tag.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking id3tag.h presence" >&5
+echo $ECHO_N "checking id3tag.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -21122,24 +21720,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <id3tag.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -21147,9 +21743,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -21173,25 +21770,18 @@ echo "$as_me: WARNING: id3tag.h:     section \"Present But Cannot Be Compiled\""
 echo "$as_me: WARNING: id3tag.h: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: id3tag.h: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: id3tag.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to the easytag lists.  ##
-## ---------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for id3tag.h" >&5
-echo $ECHO_N "checking for id3tag.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for id3tag.h" >&5
+echo $ECHO_N "checking for id3tag.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_id3tag_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_id3tag_h=$ac_header_preproc
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5
-echo "${ECHO_T}$ac_cv_header_id3tag_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5
+echo "${ECHO_T}$ac_cv_header_id3tag_h" >&6; }
 
 fi
 if test $ac_cv_header_id3tag_h = yes; then
@@ -21202,8 +21792,8 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking for id3_frame_field in -lid3tag" >&5
-echo $ECHO_N "checking for id3_frame_field in -lid3tag... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for id3_frame_field in -lid3tag" >&5
+echo $ECHO_N "checking for id3_frame_field in -lid3tag... $ECHO_C" >&6; }
 if test "${ac_cv_lib_id3tag_id3_frame_field+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21216,56 +21806,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char id3_frame_field ();
 int
 main ()
 {
-id3_frame_field ();
+return id3_frame_field ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_id3tag_id3_frame_field=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_id3tag_id3_frame_field=no
+	ac_cv_lib_id3tag_id3_frame_field=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_id3tag_id3_frame_field" >&5
-echo "${ECHO_T}$ac_cv_lib_id3tag_id3_frame_field" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_id3tag_id3_frame_field" >&5
+echo "${ECHO_T}$ac_cv_lib_id3tag_id3_frame_field" >&6; }
 if test $ac_cv_lib_id3tag_id3_frame_field = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBID3TAG 1
@@ -21278,15 +21865,15 @@ else
 fi
 
     if test "x$libid3tag_available" = "xno"; then
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
         enable_mp3="no"
         echo "***"
         echo "*** Warning: MP3 file support disabled, libid3tag missing"
         echo "***"
     else
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define ENABLE_MP3 1
@@ -21295,13 +21882,12 @@ _ACEOF
     fi
 
     if test "x$enable_id3v23" = "xyes"; then
-                echo "$as_me:$LINENO: checking for library containing ID3Tag_Link" >&5
-echo $ECHO_N "checking for library containing ID3Tag_Link... $ECHO_C" >&6
+                { echo "$as_me:$LINENO: checking for library containing ID3Tag_Link" >&5
+echo $ECHO_N "checking for library containing ID3Tag_Link... $ECHO_C" >&6; }
 if test "${ac_cv_search_ID3Tag_Link+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_func_search_save_LIBS=$LIBS
-ac_cv_search_ID3Tag_Link=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -21309,115 +21895,73 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char ID3Tag_Link ();
 int
 main ()
 {
-ID3Tag_Link ();
+return ID3Tag_Link ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+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
+  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_ID3Tag_Link="none required"
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_search_ID3Tag_Link=$ac_res
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_ID3Tag_Link" = no; then
-  for ac_lib in "id3" "id3 -lstdc++" "id3 -lz" "id3 -lz -lstdc++"; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char ID3Tag_Link ();
-int
-main ()
-{
-ID3Tag_Link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_ID3Tag_Link="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_ID3Tag_Link+set}" = set; then
+  break
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
+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
-echo "$as_me:$LINENO: result: $ac_cv_search_ID3Tag_Link" >&5
-echo "${ECHO_T}$ac_cv_search_ID3Tag_Link" >&6
-if test "$ac_cv_search_ID3Tag_Link" != no; then
-  test "$ac_cv_search_ID3Tag_Link" = "none required" || LIBS="$ac_cv_search_ID3Tag_Link $LIBS"
+{ echo "$as_me:$LINENO: result: $ac_cv_search_ID3Tag_Link" >&5
+echo "${ECHO_T}$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
   { echo "$as_me:$LINENO: WARNING: id3lib not found" >&5
@@ -21431,8 +21975,8 @@ fi
         ID3LIB_MINOR=8
         ID3LIB_PATCH=0
 
-        echo "$as_me:$LINENO: checking for id3lib version" >&5
-echo $ECHO_N "checking for id3lib version... $ECHO_C" >&6
+        { echo "$as_me:$LINENO: checking for id3lib version" >&5
+echo $ECHO_N "checking for id3lib version... $ECHO_C" >&6; }
               if test "$cross_compiling" = yes; then
   echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"
 else
@@ -21457,13 +22001,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -21477,9 +22030,11 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { echo "$as_me:$LINENO: WARNING: could not determine id3lib version" >&5
 echo "$as_me: WARNING: could not determine id3lib version" >&2;}; id3lib_available=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
+
 cat >>confdefs.h <<_ACEOF
 #define ID3LIB_MAJOR $ID3LIB_MAJOR
 _ACEOF
@@ -21495,17 +22050,17 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-        echo "$as_me:$LINENO: checking for MP3 file support" >&5
-echo $ECHO_N "checking for MP3 file support... $ECHO_C" >&6
+        { echo "$as_me:$LINENO: checking for MP3 file support" >&5
+echo $ECHO_N "checking for MP3 file support... $ECHO_C" >&6; }
         if test "x$id3lib_available" = "xno"; then
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+            { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
             echo "***"
             echo "*** Warning: id3v23 tags support disabled, id3lib missing"
             echo "***"
         else
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define ENABLE_ID3LIB 1
@@ -21519,8 +22074,8 @@ fi
 
 if test "x$enable_mp4" = "xyes"; then
 
-echo "$as_me:$LINENO: checking for cos in -lm" >&5
-echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for cos in -lm" >&5
+echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6; }
 if test "${ac_cv_lib_m_cos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21533,56 +22088,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char cos ();
 int
 main ()
 {
-cos ();
+return cos ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_m_cos=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_m_cos=no
+	ac_cv_lib_m_cos=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
-echo "${ECHO_T}$ac_cv_lib_m_cos" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
+echo "${ECHO_T}$ac_cv_lib_m_cos" >&6; }
 if test $ac_cv_lib_m_cos = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
@@ -21593,8 +22145,8 @@ _ACEOF
 fi
 
 
-echo "$as_me:$LINENO: checking for MP4GetTrackMediaDataName in -lmp4v2" >&5
-echo $ECHO_N "checking for MP4GetTrackMediaDataName in -lmp4v2... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for MP4GetTrackMediaDataName in -lmp4v2" >&5
+echo $ECHO_N "checking for MP4GetTrackMediaDataName in -lmp4v2... $ECHO_C" >&6; }
 if test "${ac_cv_lib_mp4v2_MP4GetTrackMediaDataName+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21607,56 +22159,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char MP4GetTrackMediaDataName ();
 int
 main ()
 {
-MP4GetTrackMediaDataName ();
+return MP4GetTrackMediaDataName ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_mp4v2_MP4GetTrackMediaDataName=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_mp4v2_MP4GetTrackMediaDataName=no
+	ac_cv_lib_mp4v2_MP4GetTrackMediaDataName=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mp4v2_MP4GetTrackMediaDataName" >&5
-echo "${ECHO_T}$ac_cv_lib_mp4v2_MP4GetTrackMediaDataName" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mp4v2_MP4GetTrackMediaDataName" >&5
+echo "${ECHO_T}$ac_cv_lib_mp4v2_MP4GetTrackMediaDataName" >&6; }
 if test $ac_cv_lib_mp4v2_MP4GetTrackMediaDataName = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBMP4V2 1
@@ -21670,20 +22219,20 @@ fi
 
 fi
 
-echo "$as_me:$LINENO: checking for MP4/AAC file support" >&5
-echo $ECHO_N "checking for MP4/AAC file support... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for MP4/AAC file support" >&5
+echo $ECHO_N "checking for MP4/AAC file support... $ECHO_C" >&6; }
 if test "x$enable_mp4" = "xyes"; then
     if test "x$mp4_available" = "xno"; then
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
         enable_mp4="no"
         echo "***"
         echo "*** Warning: MP4 file support disabled"
         echo "*** (Install libmp4v2 to enable it)"
         echo "***"
     else
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define ENABLE_MP4 1
@@ -21691,8 +22240,8 @@ _ACEOF
 
     fi
 else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
     enable_mp4="no"
     echo "***"
     echo "*** MP4 file support disabled on commandline"
@@ -21704,8 +22253,8 @@ fi
 if test "x$enable_wavpack" = "xyes"; then
 
 pkg_failed=no
-echo "$as_me:$LINENO: checking for WAVPACK" >&5
-echo $ECHO_N "checking for WAVPACK... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for WAVPACK" >&5
+echo $ECHO_N "checking for WAVPACK... $ECHO_C" >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$WAVPACK_CFLAGS"; then
@@ -21761,16 +22310,16 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$WAVPACK_PKG_ERRORS" >&5
 
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
                 wavpack_available=no
 elif test $pkg_failed = untried; then
 	wavpack_available=no
 else
 	WAVPACK_CFLAGS=$pkg_cv_WAVPACK_CFLAGS
 	WAVPACK_LIBS=$pkg_cv_WAVPACK_LIBS
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	:
 fi
     if test "x$wavpack_available" = "xno"; then
@@ -21779,8 +22328,8 @@ fi
         echo "***"
     fi
 
-echo "$as_me:$LINENO: checking for cos in -lm" >&5
-echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for cos in -lm" >&5
+echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6; }
 if test "${ac_cv_lib_m_cos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21793,56 +22342,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char cos ();
 int
 main ()
 {
-cos ();
+return cos ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_m_cos=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_m_cos=no
+	ac_cv_lib_m_cos=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
-echo "${ECHO_T}$ac_cv_lib_m_cos" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
+echo "${ECHO_T}$ac_cv_lib_m_cos" >&6; }
 if test $ac_cv_lib_m_cos = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
@@ -21853,8 +22399,8 @@ _ACEOF
 fi
 
 
-echo "$as_me:$LINENO: checking for WavpackOpenFileInput in -lwavpack" >&5
-echo $ECHO_N "checking for WavpackOpenFileInput in -lwavpack... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for WavpackOpenFileInput in -lwavpack" >&5
+echo $ECHO_N "checking for WavpackOpenFileInput in -lwavpack... $ECHO_C" >&6; }
 if test "${ac_cv_lib_wavpack_WavpackOpenFileInput+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21867,56 +22413,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char WavpackOpenFileInput ();
 int
 main ()
 {
-WavpackOpenFileInput ();
+return WavpackOpenFileInput ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_wavpack_WavpackOpenFileInput=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_wavpack_WavpackOpenFileInput=no
+	ac_cv_lib_wavpack_WavpackOpenFileInput=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_wavpack_WavpackOpenFileInput" >&5
-echo "${ECHO_T}$ac_cv_lib_wavpack_WavpackOpenFileInput" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_wavpack_WavpackOpenFileInput" >&5
+echo "${ECHO_T}$ac_cv_lib_wavpack_WavpackOpenFileInput" >&6; }
 if test $ac_cv_lib_wavpack_WavpackOpenFileInput = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBWAVPACK 1
@@ -21930,20 +22473,20 @@ fi
 
 fi
 
-echo "$as_me:$LINENO: checking for Wavpack file support" >&5
-echo $ECHO_N "checking for Wavpack file support... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for Wavpack file support" >&5
+echo $ECHO_N "checking for Wavpack file support... $ECHO_C" >&6; }
 if test "x$enable_wavpack" = "xyes"; then
     if test "x$wavpack_available" = "xno"; then
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
         enable_wavpack="no"
         echo "***"
         echo "*** Warning: Wavpack file support disabled"
         echo "*** (Install libwavpack to enable it)"
         echo "***"
     else
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define ENABLE_WAVPACK 1
@@ -21951,8 +22494,8 @@ _ACEOF
 
     fi
 else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
     enable_wavpack="no"
     echo "***"
     echo "*** Wavpack file support disabled on commandline"
@@ -21978,9 +22521,9 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -22002,38 +22545,35 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_Header=no"
+	eval "$as_ac_Header=no"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
@@ -22045,13 +22585,12 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
 if test "${ac_cv_search_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_func_search_save_LIBS=$LIBS
-ac_cv_search_opendir=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22059,126 +22598,83 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char opendir ();
 int
 main ()
 {
-opendir ();
+return opendir ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+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
+  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="none required"
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_search_opendir=$ac_res
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_opendir" = no; then
-  for ac_lib in dir; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char opendir ();
-int
-main ()
-{
-opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then
+  break
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
+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
-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6
-if test "$ac_cv_search_opendir" != no; then
-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+echo "${ECHO_T}$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
-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
 if test "${ac_cv_search_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_func_search_save_LIBS=$LIBS
-ac_cv_search_opendir=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22186,122 +22682,80 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char opendir ();
 int
 main ()
 {
-opendir ();
+return opendir ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+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
+  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="none required"
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_search_opendir=$ac_res
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_opendir" = no; then
-  for ac_lib in x; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char opendir ();
-int
-main ()
-{
-opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then
+  break
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
+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
-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6
-if test "$ac_cv_search_opendir" != no; then
-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+echo "${ECHO_T}$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
 
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22325,35 +22779,31 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_stdc=no
+	ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+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.
@@ -22409,6 +22859,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* 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))
@@ -22428,18 +22879,27 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -22452,12 +22912,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -22471,18 +22933,19 @@ fi
 for ac_header in fcntl.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22493,41 +22956,37 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22536,24 +22995,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -22561,9 +23018,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -22587,25 +23045,19 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to the easytag lists.  ##
-## ---------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -22619,8 +23071,8 @@ done
 
 
 
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22638,10 +23090,10 @@ main ()
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];
-  const charset x;
+  const charset cs;
   /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
+  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};
@@ -22650,16 +23102,17 @@ main ()
      an arm of an if-expression whose if-part is not a constant
      expression */
   const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
+  pcpcc = &g + (g ? g-g : 0);
   /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
+  ++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};
@@ -22678,7 +23131,9 @@ main ()
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
+    if (!foo) return 0;
   }
+  return !cs[0] && !zero.x;
 #endif
 
   ;
@@ -22686,38 +23141,34 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_c_const=no
+	ac_cv_c_const=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+echo "${ECHO_T}$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -22726,8 +23177,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for mode_t" >&5
-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for mode_t" >&5
+echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22738,50 +23189,47 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef mode_t ac__type_new_;
 int
 main ()
 {
-if ((mode_t *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (mode_t))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_mode_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_mode_t=no
+	ac_cv_type_mode_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-echo "${ECHO_T}$ac_cv_type_mode_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
 if test $ac_cv_type_mode_t = yes; then
   :
 else
@@ -22792,8 +23240,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for pid_t" >&5
+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22804,50 +23252,47 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef pid_t ac__type_new_;
 int
 main ()
 {
-if ((pid_t *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (pid_t))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_pid_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_pid_t=no
+	ac_cv_type_pid_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
 if test $ac_cv_type_pid_t = yes; then
   :
 else
@@ -22858,8 +23303,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22870,62 +23315,59 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((size_t *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (size_t))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_size_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_size_t=no
+	ac_cv_type_size_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
 if test $ac_cv_type_size_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define size_t unsigned
+#define size_t unsigned int
 _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
 if test "${ac_cv_struct_tm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22941,44 +23383,42 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-struct tm *tp; tp->tm_sec;
+struct tm tm;
+				     int *p = &tm.tm_sec;
+ 				     return !p;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_struct_tm=time.h
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_struct_tm=sys/time.h
+	ac_cv_struct_tm=sys/time.h
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -22990,22 +23430,22 @@ fi
 
 
 
-
-for ac_header in unistd.h vfork.h
+for ac_header in vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23016,41 +23456,37 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23059,24 +23495,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -23084,9 +23518,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -23110,25 +23545,19 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to the easytag lists.  ##
-## ---------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -23145,9 +23574,9 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -23173,68 +23602,60 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* 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_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -23244,8 +23665,8 @@ fi
 done
 
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:$LINENO: checking for working fork" >&5
-echo $ECHO_N "checking for working fork... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for working fork" >&5
+echo $ECHO_N "checking for working fork... $ECHO_C" >&6; }
 if test "${ac_cv_func_fork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -23253,27 +23674,40 @@ else
   ac_cv_func_fork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-/* By Ruediger Kuhlmann. */
-      #include <sys/types.h>
-      #if HAVE_UNISTD_H
-      # include <unistd.h>
-      #endif
-      /* Some systems only have a dummy stub for fork() */
-      int main ()
-      {
-	if (fork() < 0)
-	  exit (1);
-	exit (0);
-      }
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	  /* By Ruediger Kuhlmann. */
+	  return fork () < 0;
+
+  ;
+  return 0;
+}
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -23286,11 +23720,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_func_fork_works=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
-echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
+echo "${ECHO_T}$ac_cv_func_fork_works" >&6; }
 
 else
   ac_cv_func_fork_works=$ac_cv_func_fork
@@ -23310,8 +23746,8 @@ echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross co
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
-  echo "$as_me:$LINENO: checking for working vfork" >&5
-echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for working vfork" >&5
+echo $ECHO_N "checking for working vfork... $ECHO_C" >&6; }
 if test "${ac_cv_func_vfork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -23325,15 +23761,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 /* Thanks to Paul Eggert for this test.  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
 #include <sys/wait.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#if HAVE_VFORK_H
+#ifdef HAVE_VFORK_H
 # include <vfork.h>
 #endif
 /* On some sparc systems, changes by the child to local and incoming
@@ -23404,7 +23834,7 @@ main ()
 
     while (wait(&status) != child)
       ;
-    exit(
+    return (
 	 /* Was there some problem with vforking?  */
 	 child < 0
 
@@ -23421,13 +23851,22 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -23440,11 +23879,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_func_vfork_works=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
-echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
+echo "${ECHO_T}$ac_cv_func_vfork_works" >&6; }
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
@@ -23474,8 +23915,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
-echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
+echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6; }
 if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -23499,19 +23940,28 @@ struct stat sbuf;
      /* Linux will dereference the symlink and fail.
 	That is better in the sense that it means we will not
 	have to compile and use the lstat wrapper.  */
-     exit (lstat ("conftest.sym/", &sbuf) ? 0 : 1);
+     return lstat ("conftest.sym/", &sbuf) == 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -23524,8 +23974,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_func_lstat_dereferences_slashed_symlink=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 else
   # If the `ln -s' command failed, then we probably don't even
   # have an lstat function.
@@ -23534,8 +23986,8 @@ fi
 rm -f conftest.sym conftest.file
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
-echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
 
 test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
 
@@ -23545,18 +23997,16 @@ _ACEOF
 
 
 if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
-  case $LIBOBJS in
-    "lstat.$ac_objext"   | \
-  *" lstat.$ac_objext"   | \
-    "lstat.$ac_objext "* | \
+  case " $LIBOBJS " in
   *" lstat.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS lstat.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
+ ;;
 esac
 
 fi
 
-echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5
-echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5
+echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6; }
 if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -23574,43 +24024,52 @@ int
 main ()
 {
 struct stat sbuf;
-  exit (stat ("", &sbuf) ? 1 : 0);
+  return stat ("", &sbuf) == 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_func_stat_empty_string_bug=yes
+  ac_cv_func_stat_empty_string_bug=no
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-ac_cv_func_stat_empty_string_bug=no
+ac_cv_func_stat_empty_string_bug=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5
-echo "${ECHO_T}$ac_cv_func_stat_empty_string_bug" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5
+echo "${ECHO_T}$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"   | \
-  *" stat.$ac_objext"   | \
-    "stat.$ac_objext "* | \
+  case " $LIBOBJS " in
   *" stat.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS stat.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS stat.$ac_objext"
+ ;;
 esac
 
 
@@ -23620,8 +24079,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -23633,56 +24092,44 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <signal.h>
-#ifdef signal
-# undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
 
 int
 main ()
 {
-int i;
+return *(signal (0, 0)) (0) == 1;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_signal=void
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_signal=int
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_signal=int
+	ac_cv_type_signal=void
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+echo "${ECHO_T}$ac_cv_type_signal" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define RETSIGTYPE $ac_cv_type_signal
@@ -23696,9 +24143,9 @@ _ACEOF
 for ac_func in mkdir strstr strtol mkstemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -23724,68 +24171,60 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* 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_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -23801,18 +24240,19 @@ done
 for ac_header in locale.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23823,41 +24263,37 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23866,24 +24302,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -23891,9 +24325,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -23917,25 +24352,19 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to the easytag lists.  ##
-## ---------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -23948,8 +24377,8 @@ fi
 done
 
     if test $ac_cv_header_locale_h = yes; then
-    echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -23969,39 +24398,36 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   am_cv_val_LC_MESSAGES=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-am_cv_val_LC_MESSAGES=no
+	am_cv_val_LC_MESSAGES=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
     if test $am_cv_val_LC_MESSAGES = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -24020,17 +24446,17 @@ _ACEOF
     INTLLIBS=
 
     if test "${ac_cv_header_libintl_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for libintl.h" >&5
+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_libintl_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking libintl.h usability" >&5
-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24041,41 +24467,37 @@ $ac_includes_default
 #include <libintl.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking libintl.h presence" >&5
-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24084,24 +24506,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <libintl.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -24109,9 +24529,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -24135,25 +24556,18 @@ echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"
 echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to the easytag lists.  ##
-## ---------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for libintl.h" >&5
+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_libintl_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_libintl_h=$ac_header_preproc
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
 
 fi
 if test $ac_cv_header_libintl_h = yes; then
@@ -24163,8 +24577,8 @@ if test $ac_cv_header_libintl_h = yes; then
       #
       # First check in libc
       #
-      echo "$as_me:$LINENO: checking for ngettext in libc" >&5
-echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
 if test "${gt_cv_func_ngettext_libc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -24186,44 +24600,41 @@ return !ngettext ("","", 1)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   gt_cv_func_ngettext_libc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-gt_cv_func_ngettext_libc=no
+	gt_cv_func_ngettext_libc=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
-echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6
+{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
+echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
 
       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-	      echo "$as_me:$LINENO: checking for dgettext in libc" >&5
-echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6
+	      { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
 if test "${gt_cv_func_dgettext_libc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -24245,40 +24656,37 @@ return !dgettext ("","")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   gt_cv_func_dgettext_libc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-gt_cv_func_dgettext_libc=no
+	gt_cv_func_dgettext_libc=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
-echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6
+{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
       fi
 
       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
@@ -24286,9 +24694,9 @@ echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6
 for ac_func in bind_textdomain_codeset
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -24314,68 +24722,60 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* 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_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -24393,8 +24793,8 @@ done
 	 || test "$gt_cv_func_ngettext_libc" != "yes" \
          || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
 
-        echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6
+        { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -24407,59 +24807,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char bindtextdomain ();
 int
 main ()
 {
-bindtextdomain ();
+return bindtextdomain ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_intl_bindtextdomain=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_intl_bindtextdomain=no
+	ac_cv_lib_intl_bindtextdomain=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
 if test $ac_cv_lib_intl_bindtextdomain = yes; then
-  echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_intl_ngettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -24472,59 +24869,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char ngettext ();
 int
 main ()
 {
-ngettext ();
+return ngettext ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_intl_ngettext=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_intl_ngettext=no
+	ac_cv_lib_intl_ngettext=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
 if test $ac_cv_lib_intl_ngettext = yes; then
-  echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_intl_dgettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -24537,56 +24931,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dgettext ();
 int
 main ()
 {
-dgettext ();
+return dgettext ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_intl_dgettext=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_intl_dgettext=no
+	ac_cv_lib_intl_dgettext=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
 if test $ac_cv_lib_intl_dgettext = yes; then
   gt_cv_func_dgettext_libintl=yes
 fi
@@ -24597,12 +24988,12 @@ fi
 
 
 	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
-echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6
-	  echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
-  	  echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6
+	  { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
+	  { echo "$as_me:$LINENO: result: " >&5
+echo "${ECHO_T}" >&6; }
+  	  { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_intl_ngettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -24615,59 +25006,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char ngettext ();
 int
 main ()
 {
-ngettext ();
+return ngettext ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_intl_ngettext=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_intl_ngettext=no
+	ac_cv_lib_intl_ngettext=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
 if test $ac_cv_lib_intl_ngettext = yes; then
-  echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -24680,56 +25068,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dcgettext ();
 int
 main ()
 {
-dcgettext ();
+return dcgettext ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_intl_dcgettext=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_intl_dcgettext=no
+	ac_cv_lib_intl_dcgettext=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
 if test $ac_cv_lib_intl_dcgettext = yes; then
   gt_cv_func_dgettext_libintl=yes
 			libintl_extra_libs=-liconv
@@ -24756,9 +25141,9 @@ fi
 for ac_func in bind_textdomain_codeset
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -24784,68 +25169,60 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* 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_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -24884,8 +25261,8 @@ _ACEOF
 
 	# Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -24911,11 +25288,11 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != "no"; then
-  echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 	if test "$MSGFMT" != "no"; then
           glib_save_LIBS="$LIBS"
@@ -24924,9 +25301,9 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -24952,68 +25329,60 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* 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_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -25022,10 +25391,39 @@ _ACEOF
 fi
 done
 
+	  MSGFMT_OPTS=
+	  { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_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@bar.xx>\n"
+"Language-Team: C <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+_ACEOF
+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25040,32 +25438,33 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     echo "$as_me:$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
-  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 	  # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25091,11 +25490,11 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 	  cat >conftest.$ac_ext <<_ACEOF
@@ -25115,37 +25514,33 @@ extern int _nl_msg_cat_cntr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   CATOBJEXT=.gmo
              DATADIRNAME=share
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-case $host in
+	case $host in
 	    *-*-solaris*)
-	    	                	    	                echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6
+	    	                	    	                { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
 if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25172,68 +25567,59 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef bind_textdomain_codeset
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char bind_textdomain_codeset ();
 /* 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_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset)
+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
 choke me
-#else
-char (*f) () = bind_textdomain_codeset;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != bind_textdomain_codeset;
+return bind_textdomain_codeset ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_bind_textdomain_codeset=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_bind_textdomain_codeset=no
+	ac_cv_func_bind_textdomain_codeset=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
 if test $ac_cv_func_bind_textdomain_codeset = yes; then
   CATOBJEXT=.gmo
                DATADIRNAME=share
@@ -25249,7 +25635,8 @@ fi
 	    ;;
 	    esac
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
           LIBS="$glib_save_LIBS"
 	  INSTOBJEXT=.mo
@@ -25274,8 +25661,8 @@ _ACEOF
                   if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
         : ;
       else
-        echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
+        { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
         XGETTEXT=":"
       fi
     fi
@@ -25283,7 +25670,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
     # We need to process the po/ directory.
     POSUB=po
 
-              ac_config_commands="$ac_config_commands default-1"
+    ac_config_commands="$ac_config_commands default-1"
 
 
                 for lang in $ALL_LINGUAS; do
@@ -25307,8 +25694,8 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
+       { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
          useit=no
@@ -25332,8 +25719,8 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:$LINENO: result: $LINGUAS" >&5
-echo "${ECHO_T}$LINGUAS" >&6
+       { echo "$as_me:$LINENO: result: $LINGUAS" >&5
+echo "${ECHO_T}$LINGUAS" >&6; }
      fi
 
           if test -n "$LINGUAS"; then
@@ -25366,11 +25753,12 @@ echo "${ECHO_T}$LINGUAS" >&6
 
 
 
-          ac_config_headers="$ac_config_headers config.h"
+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"
 
-                                                                                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
@@ -25389,39 +25777,58 @@ _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, don't put newlines in cache variables' values.
+# 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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+
   (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    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 \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-} |
+    esac |
+    sort
+) |
   sed '
+     /^ac_cv_env_/b end
      t clear
-     : clear
+     :clear
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
-     /^ac_cv_env/!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" && echo "updating cache $cache_file"
+     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" &&
+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    echo "not updating unwritable cache $cache_file"
+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -25430,32 +25837,18 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ 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[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
 DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`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.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -25514,17 +25907,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# 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=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# 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
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -25534,8 +25955,43 @@ else
 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.)
+as_nl='
+'
+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
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -25549,18 +26005,19 @@ do
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+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
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -25568,159 +26025,120 @@ fi
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# 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
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
+# CDPATH.
+$as_unset CDPATH
 
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  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
 
-       ;;
-  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
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+  chmod +x "$as_me.lineno" ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); 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 sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 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
+fi
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
+  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'
-  else
-    as_ln_s='ln -s'
-  fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+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=:
@@ -25729,7 +26147,28 @@ else
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+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'"
@@ -25738,31 +26177,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
 exec 6>&1
 
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# 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.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by easytag $as_me 2.1.2, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+# values after options handling.
+ac_log="
+This file was extended by easytag $as_me 2.1.3, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -25770,30 +26192,20 @@ generated by GNU Autoconf 2.59.  Invocation command line was
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
 _ACEOF
 
+cat >>$CONFIG_STATUS <<_ACEOF
 # Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
 
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
+_ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
-
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -25801,7 +26213,7 @@ current configuration.
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
@@ -25820,19 +26232,22 @@ Configuration commands:
 $config_commands
 
 Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
 
+_ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-easytag config.status 2.1.2
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+easytag config.status 2.1.3
+configured by $0, generated by GNU Autoconf 2.61,
+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -25843,39 +26258,24 @@ while test $# != 0
 do
   case $1 in
   --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  -*)
+  *)
     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
   esac
 
   case $ac_option in
   # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
@@ -25885,18 +26285,24 @@ Try \`$0 --help' for more information." >&2;}
     $ac_shift
     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    { echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    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.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
+  -*) { echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
-  *) ac_config_targets="$ac_config_targets $1" ;;
+  *) ac_config_targets="$ac_config_targets $1"
+     ac_need_defaults=false ;;
 
   esac
   shift
@@ -25912,46 +26318,58 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  CONFIG_SHELL=$SHELL
+  export CONFIG_SHELL
+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 fi
 
 _ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  echo "$ac_log"
+} >&5
 
+_ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 #
-# INIT-COMMANDS section.
+# INIT-COMMANDS
 #
-
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 
 _ACEOF
 
-
-
 cat >>$CONFIG_STATUS <<\_ACEOF
+
+# Handling of arguments.
 for ac_config_target in $ac_config_targets
 do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "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" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+  case $ac_config_target in
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "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" ;;
+
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   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
@@ -25963,635 +26381,630 @@ if $ac_need_defaults; then
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
 # creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# 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 ||
 {
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
   trap '{ (exit 1); exit 1; }' 1 2 13 15
 }
-
 # Create a (secure) tmp directory for tmp files.
 
 {
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
 } ||
 {
    echo "$me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
 #
-# CONFIG_FILES section.
+# Set up the sed scripts for CONFIG_FILES section.
 #
 
 # No need to generate the scripts if there are no CONFIG_FILES.
 # This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@install_sh@,$install_sh,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@am__tar@,$am__tar,;t t
-s,@am__untar@,$am__untar,;t t
-s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@DEPDIR@,$DEPDIR,;t t
-s,@am__include@,$am__include,;t t
-s,@am__quote@,$am__quote,;t t
-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s,@CCDEPMODE@,$CCDEPMODE,;t t
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@CXX@,$CXX,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@SED@,$SED,;t t
-s,@EGREP@,$EGREP,;t t
-s,@LN_S@,$LN_S,;t t
-s,@ECHO@,$ECHO,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@CPP@,$CPP,;t t
-s,@F77@,$F77,;t t
-s,@FFLAGS@,$FFLAGS,;t t
-s,@ac_ct_F77@,$ac_ct_F77,;t t
-s,@LIBTOOL@,$LIBTOOL,;t t
-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s,@MAINT@,$MAINT,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
-s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
-s,@GLIB_LIBS@,$GLIB_LIBS,;t t
-s,@GLIB_GENMARSHAL@,$GLIB_GENMARSHAL,;t t
-s,@GOBJECT_QUERY@,$GOBJECT_QUERY,;t t
-s,@GLIB_MKENUMS@,$GLIB_MKENUMS,;t t
-s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
-s,@GTK_LIBS@,$GTK_LIBS,;t t
-s,@OGG_CFLAGS@,$OGG_CFLAGS,;t t
-s,@OGG_LIBS@,$OGG_LIBS,;t t
-s,@VORBIS_CFLAGS@,$VORBIS_CFLAGS,;t t
-s,@VORBIS_LIBS@,$VORBIS_LIBS,;t t
-s,@WAVPACK_CFLAGS@,$WAVPACK_CFLAGS,;t t
-s,@WAVPACK_LIBS@,$WAVPACK_LIBS,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@USE_NLS@,$USE_NLS,;t t
-s,@MSGFMT@,$MSGFMT,;t t
-s,@GMSGFMT@,$GMSGFMT,;t t
-s,@XGETTEXT@,$XGETTEXT,;t t
-s,@CATALOGS@,$CATALOGS,;t t
-s,@CATOBJEXT@,$CATOBJEXT,;t t
-s,@DATADIRNAME@,$DATADIRNAME,;t t
-s,@GMOFILES@,$GMOFILES,;t t
-s,@INSTOBJEXT@,$INSTOBJEXT,;t t
-s,@INTLLIBS@,$INTLLIBS,;t t
-s,@PO_IN_DATADIR_TRUE@,$PO_IN_DATADIR_TRUE,;t t
-s,@PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t
-s,@POFILES@,$POFILES,;t t
-s,@POSUB@,$POSUB,;t t
-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
+if test -n "$CONFIG_FILES"; then
+
+_ACEOF
+
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+CXX!$CXX$ac_delim
+CXXFLAGS!$CXXFLAGS$ac_delim
+ac_ct_CXX!$ac_ct_CXX$ac_delim
+CXXDEPMODE!$CXXDEPMODE$ac_delim
+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+CXXCPP!$CXXCPP$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+SED!$SED$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+LN_S!$LN_S$ac_delim
+ECHO!$ECHO$ac_delim
+AR!$AR$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
-fi # test -n "$CONFIG_FILES"
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+RANLIB!$RANLIB$ac_delim
+CPP!$CPP$ac_delim
+F77!$F77$ac_delim
+FFLAGS!$FFLAGS$ac_delim
+ac_ct_F77!$ac_ct_F77$ac_delim
+LIBTOOL!$LIBTOOL$ac_delim
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
+GLIB_LIBS!$GLIB_LIBS$ac_delim
+GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim
+GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim
+GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim
+GTK_CFLAGS!$GTK_CFLAGS$ac_delim
+GTK_LIBS!$GTK_LIBS$ac_delim
+OGG_CFLAGS!$OGG_CFLAGS$ac_delim
+OGG_LIBS!$OGG_LIBS$ac_delim
+VORBIS_CFLAGS!$VORBIS_CFLAGS$ac_delim
+VORBIS_LIBS!$VORBIS_LIBS$ac_delim
+WAVPACK_CFLAGS!$WAVPACK_CFLAGS$ac_delim
+WAVPACK_LIBS!$WAVPACK_LIBS$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+USE_NLS!$USE_NLS$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+CATALOGS!$CATALOGS$ac_delim
+CATOBJEXT!$CATOBJEXT$ac_delim
+DATADIRNAME!$DATADIRNAME$ac_delim
+GMOFILES!$GMOFILES$ac_delim
+INSTOBJEXT!$INSTOBJEXT$ac_delim
+INTLLIBS!$INTLLIBS$ac_delim
+PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
+PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
+POFILES!$POFILES$ac_delim
+POSUB!$POSUB$ac_delim
+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
 
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
 _ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ 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[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
 cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
+fi # test -n "$CONFIG_FILES"
+
+
+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+   { (exit 1); exit 1; }; };;
+  :[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
 
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+  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 ||
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+      ac_file_inputs="$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 "`IFS=:
+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    fi
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin";;
+    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 ||
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
     as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`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 ||
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    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 ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-
   ac_builddir=.
 
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`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
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    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 ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+    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
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
 
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
 
   case $INSTALL in
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$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
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # 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.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
+cat >>$CONFIG_STATUS <<\_ACEOF
+# 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=
+
+case `sed -n '/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+' $ac_file_inputs` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
+  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
   sed "$ac_vpsub
 $extrasub
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;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,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;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
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+
+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"; } &&
+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+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
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
+  -) cat "$tmp/out"; rm -f "$tmp/out";;
+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
   esac
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+_ACEOF
 
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status.  If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless.  But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
+ac_dB='\\)[	 (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+  sed -n '
+	t rset
+	:rset
+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
+	t ok
+	d
+	:ok
+	s/[\\&,]/\\&/g
+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+  ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then 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.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[	 #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
 do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+  # Write a here document:
+    cat >>$CONFIG_STATUS <<_ACEOF
+    # First, check the format of the line:
+    cat >"\$tmp/defines.sed" <<\\CEOF
+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
+b
+:def
+_ACEOF
+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
   echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+  grep . conftest.tail >/dev/null || break
   rm -f conftest.defines
   mv conftest.tail conftest.defines
 done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
+rm -f conftest.defines conftest.tail
 
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
 cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
   if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+    echo "/* $configure_input  */" >"$tmp/config.h"
+    cat "$ac_result" >>"$tmp/config.h"
+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
       rm -f $ac_file
-      mv $tmp/config.h $ac_file
+      mv "$tmp/config.h" $ac_file
     fi
   else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
+    echo "/* $configure_input  */"
+    cat "$ac_result"
   fi
+  rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
 _am_stamp_count=1
 for _am_header in $config_headers :; do
@@ -26602,135 +27015,39 @@ for _am_header in $config_headers :; do
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+echo "timestamp for $ac_file" >`$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 ||
+	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
 echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
 
 
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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.
@@ -26738,20 +27055,32 @@ echo "$as_me: executing $ac_dest commands" >&6;}
   # 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.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
+  # 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 10q "$mf" | grep '^#.*generated by automake' > /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 ||
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   else
     continue
   fi
@@ -26773,56 +27102,82 @@ echo X"$mf" |
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
+    fdir=`$as_dirname -- "$file" ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
     as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`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 ||
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    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 ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
   done
 done
  ;;
-    default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*)
+    "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
       esac ;;
+
   esac
-done
-_ACEOF
+done # for ac_tag
 
-cat >>$CONFIG_STATUS <<\_ACEOF
 
 { (exit 0); exit 0; }
 _ACEOF
diff --git a/configure.in b/configure.in
index 71be00f..452e45c 100755..100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,8 @@ dnl AC_INIT(src/easytag.h)
 
 AC_PREREQ(2.53)
 
-AC_INIT(easytag, 2.1.2) dnl defines ($PACKAGE, $VERSION) - To set also in config.h.mingw
+dnl To set also in config.h.mingw
+AC_INIT(easytag, 2.1.3) dnl defines ($PACKAGE, $VERSION)
 
 AC_CONFIG_SRCDIR(src/easytag.h)
 dnl -------------------------------
@@ -14,7 +15,7 @@ AM_INIT_AUTOMAKE(foreign)
 dnl -------------------------------
 dnl Translation files
 dnl -------------------------------
-ALL_LINGUAS="bg cs da de el es fr he hu it ja nl pl pt_BR ro ru sv uk zh_CN"
+ALL_LINGUAS="bg cs da de el es fr he hu it ja nl pl pt_BR ro ru sr sr@Latn sv uk zh_CN"
 GETTEXT_PACKAGE=easytag
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
diff --git a/debian/changelog b/debian/changelog
index 0a44682..0e65f3e 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+easytag (2.1.2-1) unstable; urgency=low
+
+  * New upstream version:
+    - Fixed a mistake in the configure script (Closes: #432257)
+  * debian/control:
+    - Build-Depends on libid3tag0-dev, libspeex-dev (Closes: #401523, #434428)
+    - updated Standards-Version to 3.7.2
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu,  2 Aug 2007 12:55:18 +0200
+
+easytag (2.1.1-1) unstable; urgency=low
+
+  * New upstream version (Closes: #414201):
+    - Added Speex support (Closes: #401523)
+  * debian/control:
+    - Build-Depends on libwavpack-dev
+    - correct spelling mistake, 
+      change indicated by Simon Waters <simon@technocool.net> (Closes: #363374)
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat,  7 Jul 2007 14:37:46 +0200
+
 easytag (2.1-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/control b/debian/control
index a344382..eaed314 100755
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,15 @@ Source: easytag
 Section: sound
 Priority: optional
 Maintainer: Sebastien Bacher <seb128@debian.org>
-Build-Depends: cdbs, debhelper (>= 4.0), libglib2.0-dev (>= 2.8), libgtk2.0-dev (>= 2.4), gettext, libvorbis-dev, libogg-dev, zlib1g-dev, libid3-3.8.3-dev, libflac-dev (>= 1.1.2)
-Standards-Version: 3.6.2
+Build-Depends: cdbs, debhelper (>= 4.0), libglib2.0-dev (>= 2.8), libgtk2.0-dev (>= 2.4), gettext, libvorbis-dev, libogg-dev, zlib1g-dev, libid3tag0-dev, libspeex-dev, libid3-3.8.3-dev, libflac-dev (>= 1.1.2), libwavpack-dev
+Standards-Version: 3.7.2
 
 Package: easytag
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: viewing, editing and writing ID3 tags
  EasyTAG is an utility for viewing, editing and writing
- the ID3 tags of differents audio files, using a GTK+ interface.
+ the ID3 tags of different audio files, using a GTK+ interface.
  .
  Currently EasyTAG supports the following:
   - View, edit, write tags of MP3, MP2 files (ID3 tag), FLAC files (FLAC Vorbis
diff --git a/easytag.spec b/easytag.spec
index ac98fdb..13bbe43 100644
--- a/easytag.spec
+++ b/easytag.spec
@@ -1,5 +1,5 @@
 %define    name      easytag
-%define    version   2.1.2
+%define    version   2.1.3
 %define    release   1
 %define    prefix    /usr
 
@@ -106,7 +106,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %prefix/bin/easytag
 %prefix/share/applications/easytag.desktop
 %prefix/share/pixmaps/*
-%prefix/man/*/easytag.*
+%prefix/share/man/*/easytag.*
 %prefix/share/easytag/*
 %prefix/share/locale/*/*/*
 
@@ -118,6 +118,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Thu Oct 11 2007 Jerome Couderc <easytag@gmail.com>
+  - Replace "%prefix/man/*/easytag.*" by "%prefix/share/man/*/easytag.*" to
+    fix rpmbuild under Fedora 7
+
 * Fri Jun 1 2007 Jerome Couderc <easytag@gmail.com>
   - Updated (Build)Requires entries for libid3tag
 
diff --git a/easytag.spec.in b/easytag.spec.in
index 2584946..ba55161 100644
--- a/easytag.spec.in
+++ b/easytag.spec.in
@@ -106,7 +106,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %prefix/bin/easytag
 %prefix/share/applications/easytag.desktop
 %prefix/share/pixmaps/*
-%prefix/man/*/easytag.*
+%prefix/share/man/*/easytag.*
 %prefix/share/easytag/*
 %prefix/share/locale/*/*/*
 
@@ -118,6 +118,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Thu Oct 11 2007 Jerome Couderc <easytag@gmail.com>
+  - Replace "%prefix/man/*/easytag.*" by "%prefix/share/man/*/easytag.*" to
+    fix rpmbuild under Fedora 7
+
 * Fri Jun 1 2007 Jerome Couderc <easytag@gmail.com>
   - Updated (Build)Requires entries for libid3tag
 
diff --git a/easytag.win32.setup.iss b/easytag.win32.setup.iss
index 2327565..f78efd8 100755..100644
--- a/easytag.win32.setup.iss
+++ b/easytag.win32.setup.iss
@@ -17,7 +17,7 @@
 

 ; Here you can specify the current version of EasyTAG.

 #define APP_NAME 	"EasyTAG"

-#define APP_VERSION "2.1.2"

+#define APP_VERSION "2.1.3"

 #define APP_URL 	"http://easytag.sourceforge.net"

 #define APP_NAME_2 	"easytag"

 #define DEV_NAME 	"J�r�me COUDERC"

diff --git a/ltmain.sh b/ltmain.sh
index 0223495..d70dc75 100755..100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -6460,8 +6460,6 @@ relink_command=\"$relink_command\""
       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
 
diff --git a/pixmaps/EasyTAG.xpm b/pixmaps/EasyTAG.xpm
deleted file mode 100755
index 4c154ff..0000000
--- a/pixmaps/EasyTAG.xpm
+++ /dev/null
@@ -1,631 +0,0 @@
-/* XPM */

-static char * EasyTAG_xpm[] = {

-"60 60 568 2",

-"  	c None",

-". 	c #FFDB49",

-"+ 	c #FEDB49",

-"@ 	c #FEDA49",

-"# 	c #FEDC49",

-"$ 	c #FEDC48",

-"% 	c #FEDD48",

-"& 	c #FFDC49",

-"* 	c #FEDD49",

-"= 	c #FEDE49",

-"- 	c #FEE04A",

-"; 	c #FEE24A",

-"> 	c #FEE349",

-", 	c #FEE449",

-"' 	c #FEE649",

-") 	c #FEE748",

-"! 	c #FEE848",

-"~ 	c #FEE948",

-"{ 	c #FDEA47",

-"] 	c #FDEB47",

-"^ 	c #FDEC45",

-"/ 	c #FDED45",

-"( 	c #FDEE44",

-"_ 	c #FDED43",

-": 	c #FDEB43",

-"< 	c #FEDD4A",

-"[ 	c #FEDF4B",

-"} 	c #FDE04C",

-"| 	c #FDE34D",

-"1 	c #FEE54D",

-"2 	c #FDE64E",

-"3 	c #FDE74E",

-"4 	c #FDE94F",

-"5 	c #FDEA4F",

-"6 	c #FCEC4F",

-"7 	c #FDED4F",

-"8 	c #FDEF4F",

-"9 	c #FCF04F",

-"0 	c #FCF14F",

-"a 	c #FEE44B",

-"b 	c #FCF24D",

-"c 	c #FCF14C",

-"d 	c #FCF14B",

-"e 	c #FCF04A",

-"f 	c #FDF049",

-"g 	c #FDF048",

-"h 	c #FDEF48",

-"i 	c #FDEF47",

-"j 	c #FDEF46",

-"k 	c #FDEE46",

-"l 	c #FDEE45",

-"m 	c #FDED42",

-"n 	c #FFDC4A",

-"o 	c #FEDD4B",

-"p 	c #FDDF4C",

-"q 	c #FDE14E",

-"r 	c #FDE450",

-"s 	c #FDE651",

-"t 	c #FDE852",

-"u 	c #FDEA53",

-"v 	c #FCEC54",

-"w 	c #FCED55",

-"x 	c #FCEF56",

-"y 	c #FCEA52",

-"z 	c #FBF056",

-"A 	c #FAF558",

-"B 	c #FBF759",

-"C 	c #FBF658",

-"D 	c #FBF657",

-"E 	c #FBF556",

-"F 	c #FBF555",

-"G 	c #FBF554",

-"H 	c #FBF453",

-"I 	c #FBF452",

-"J 	c #FCF351",

-"K 	c #FCF350",

-"L 	c #FCF24F",

-"M 	c #FEE24B",

-"N 	c #FEE046",

-"O 	c #F9FB62",

-"P 	c #F9FA61",

-"Q 	c #FAFA60",

-"R 	c #FAF95F",

-"S 	c #FAF95E",

-"T 	c #FAF95D",

-"U 	c #FAF85D",

-"V 	c #FAF85C",

-"W 	c #FBF258",

-"X 	c #FBF156",

-"Y 	c #FAF759",

-"Z 	c #FEE64B",

-"` 	c #FFDE4A",

-" .	c #FEE843",

-"..	c #FEE14E",

-"+.	c #FAF65A",

-"@.	c #FCED54",

-"#.	c #FDEA4C",

-"$.	c #FCF14D",

-"%.	c #FEEC41",

-"&.	c #FFDE48",

-"*.	c #FCE451",

-"=.	c #FAF85B",

-"-.	c #FEDE4B",

-";.	c #FDE851",

-">.	c #FCEF4D",

-",.	c #FDEB4C",

-"'.	c #FEE544",

-").	c #FCEC57",

-"!.	c #FDE44F",

-"~.	c #FEE24D",

-"{.	c #FCF24E",

-"].	c #FDE94C",

-"^.	c #FEEB41",

-"/.	c #FEDB48",

-"(.	c #FAF55F",

-"_.	c #F9FB63",

-":.	c #F9FA62",

-"<.	c #FAFA61",

-"[.	c #FAF960",

-"}.	c #FBEF56",

-"|.	c #FAF75A",

-"1.	c #FBF659",

-"2.	c #FBF557",

-"3.	c #FBF454",

-"4.	c #FCF04B",

-"5.	c #FFE345",

-"6.	c #F9FB64",

-"7.	c #FAF75B",

-"8.	c #FEEA41",

-"9.	c #FDE754",

-"0.	c #FDE94B",

-"a.	c #FEEC40",

-"b.	c #FBF05C",

-"c.	c #FDE650",

-"d.	c #FCF156",

-"e.	c #FDEC4C",

-"f.	c #FDEA4B",

-"g.	c #E0D743",

-"h.	c #DACF41",

-"i.	c #FCF049",

-"j.	c #F4E746",

-"k.	c #F9EB46",

-"l.	c #EFE143",

-"m.	c #C8BC37",

-"n.	c #E3D63E",

-"o.	c #BEB234",

-"p.	c #D9CB3A",

-"q.	c #B7AC31",

-"r.	c #D6C839",

-"s.	c #FEE045",

-"t.	c #F9F963",

-"u.	c #FAF85E",

-"v.	c #FAF75C",

-"w.	c #FEE34E",

-"x.	c #D8D34A",

-"y.	c #A6A238",

-"z.	c #BDB73F",

-"A.	c #ADA93A",

-"B.	c #B0AB3A",

-"C.	c #BFB93F",

-"D.	c #9F9934",

-"E.	c #CEC642",

-"F.	c #D9D045",

-"G.	c #BEB73C",

-"H.	c #E5DC48",

-"I.	c #ABA435",

-"J.	c #BAA536",

-"K.	c #CFB53C",

-"L.	c #BAB138",

-"M.	c #A79F32",

-"N.	c #A79F31",

-"O.	c #B0A733",

-"P.	c #90882A",

-"Q.	c #A59C2F",

-"R.	c #A49B2E",

-"S.	c #EADC42",

-"T.	c #B5AA32",

-"U.	c #9F962C",

-"V.	c #A69C2E",

-"W.	c #A99E2D",

-"X.	c #ADA22F",

-"Y.	c #FEEC42",

-"Z.	c #FEE04D",

-"`.	c #F9FB65",

-" +	c #FCF055",

-".+	c #9D9935",

-"++	c #DDD74A",

-"@+	c #C0BB40",

-"#+	c #AFAA3A",

-"$+	c #C3BD41",

-"%+	c #BAB33C",

-"&+	c #AAA437",

-"*+	c #A9A336",

-"=+	c #807B28",

-"-+	c #E6DD48",

-";+	c #AAA335",

-">+	c #A99E33",

-",+	c #AC9431",

-"'+	c #D4C13F",

-")+	c #898229",

-"!+	c #B7AE36",

-"~+	c #C1B738",

-"{+	c #A49B2F",

-"]+	c #9E952D",

-"^+	c #C0B636",

-"/+	c #B6AB33",

-"(+	c #D6C93B",

-"_+	c #FBEC45",

-":+	c #BEB233",

-"<+	c #E6D73E",

-"[+	c #FEE444",

-"}+	c #FDE350",

-"|+	c #FEE14D",

-"1+	c #FEE04C",

-"2+	c #E2DD4E",

-"3+	c #787529",

-"4+	c #C2BD41",

-"5+	c #928E31",

-"6+	c #A5A137",

-"7+	c #C8C242",

-"8+	c #B9B33C",

-"9+	c #C5BE3F",

-"0+	c #CCC441",

-"a+	c #B8B13A",

-"b+	c #C5BD3E",

-"c+	c #C6BE3D",

-"d+	c #D3CA40",

-"e+	c #EDD546",

-"f+	c #E7C742",

-"g+	c #F7E94A",

-"h+	c #FDF04A",

-"i+	c #FDEF49",

-"j+	c #FDEE47",

-"k+	c #FDED44",

-"l+	c #FDE753",

-"m+	c #FCF257",

-"n+	c #FDEB52",

-"o+	c #FAF456",

-"p+	c #FCF352",

-"q+	c #FCF250",

-"r+	c #E8D144",

-"s+	c #C1B839",

-"t+	c #F4E745",

-"u+	c #777021",

-"v+	c #534E17",

-"w+	c #5D581A",

-"x+	c #575218",

-"y+	c #3B3810",

-"z+	c #FFE146",

-"A+	c #FBF75A",

-"B+	c #FDE64F",

-"C+	c #FFDD4A",

-"D+	c #FBF457",

-"E+	c #D5CD45",

-"F+	c #4F4C19",

-"G+	c #54511B",

-"H+	c #3C3913",

-"I+	c #413F14",

-"J+	c #4C4918",

-"K+	c #141306",

-"L+	c #FDE74B",

-"M+	c #62541C",

-"N+	c #141206",

-"O+	c #DACF40",

-"P+	c #514D17",

-"Q+	c #877F26",

-"R+	c #EADC40",

-"S+	c #191807",

-"T+	c #FCEC44",

-"U+	c #FEDF4D",

-"V+	c #EEEF5E",

-"W+	c #E3E358",

-"X+	c #D8D854",

-"Y+	c #C8C74D",

-"Z+	c #B8B747",

-"`+	c #A6A53F",

-" @	c #A9A83F",

-".@	c #FBF458",

-"+@	c #FDE850",

-"@@	c #C8C141",

-"#@	c #686522",

-"$@	c #636020",

-"%@	c #96902F",

-"&@	c #FAEF4C",

-"*@	c #F5E94A",

-"=@	c #201C09",

-"-@	c #9E952F",

-";@	c #635E1D",

-">@	c #E3D641",

-",@	c #111005",

-"'@	c #FAEB46",

-")@	c #827A23",

-"!@	c #F4E542",

-"~@	c #FEE942",

-"{@	c #878835",

-"]@	c #5A5A23",

-"^@	c #121207",

-"/@	c #868634",

-"(@	c #9A993B",

-"_@	c #9C9C3B",

-":@	c #323213",

-"<@	c #F4F15A",

-"[@	c #F6F359",

-"}@	c #E3D048",

-"|@	c #9F9233",

-"1@	c #A7A33A",

-"2@	c #B4B03E",

-"3@	c #A4A038",

-"4@	c #88842E",

-"5@	c #757227",

-"6@	c #C6C042",

-"7@	c #676422",

-"8@	c #504E1B",

-"9@	c #716D25",

-"0@	c #696622",

-"a@	c #777326",

-"b@	c #88832B",

-"c@	c #847F29",

-"d@	c #EFE549",

-"e@	c #ACA434",

-"f@	c #5D591C",

-"g@	c #F7EB4A",

-"h@	c #201E09",

-"i@	c #E0D441",

-"j@	c #C9BE39",

-"k@	c #27250B",

-"l@	c #C0B435",

-"m@	c #5F591A",

-"n@	c #3B3710",

-"o@	c #474213",

-"p@	c #B8AD31",

-"q@	c #FEE445",

-"r@	c #FBF05B",

-"s@	c #F9FC64",

-"t@	c #F9FC63",

-"u@	c #E1E257",

-"v@	c #292910",

-"w@	c #868633",

-"x@	c #CECE4E",

-"y@	c #404018",

-"z@	c #D5D54F",

-"A@	c #51501E",

-"B@	c #6A6927",

-"C@	c #3D3C16",

-"D@	c #A9A83D",

-"E@	c #E3E051",

-"F@	c #3D3C15",

-"G@	c #BEBB43",

-"H@	c #ADA93C",

-"I@	c #494719",

-"J@	c #E6E14F",

-"K@	c #8B882F",

-"L@	c #BBB63E",

-"M@	c #6A6723",

-"N@	c #FCF452",

-"O@	c #F3EB4E",

-"P@	c #87822B",

-"Q@	c #797426",

-"R@	c #545019",

-"S@	c #353210",

-"T@	c #605C1D",

-"U@	c #2D2A0D",

-"V@	c #6B651F",

-"W@	c #E8DB42",

-"X@	c #090903",

-"Y@	c #F5E845",

-"Z@	c #5B5518",

-"`@	c #A99F2D",

-" #	c #FEED42",

-".#	c #FEDF47",

-"+#	c #FDE24F",

-"@#	c #F1F15D",

-"##	c #0E0E05",

-"$#	c #919138",

-"%#	c #3B3B17",

-"&#	c #C3C34A",

-"*#	c #C8C74B",

-"=#	c #9B9A3A",

-"-#	c #666626",

-";#	c #9E9C39",

-">#	c #54531E",

-",#	c #DDDA4E",

-"'#	c #353412",

-")#	c #A9A53B",

-"!#	c #B8B540",

-"~#	c #A19D37",

-"{#	c #FBF656",

-"]#	c #F6F053",

-"^#	c #302F10",

-"/#	c #EDE74F",

-"(#	c #696623",

-"_#	c #C2BC40",

-":#	c #979230",

-"<#	c #696521",

-"[#	c #EFE449",

-"}#	c #1D1C09",

-"|#	c #F6EB49",

-"1#	c #FDEA4A",

-"2#	c #F5DD47",

-"3#	c #171607",

-"4#	c #E7DB43",

-"5#	c #555018",

-"6#	c #746E21",

-"7#	c #FCED46",

-"8#	c #E1D33D",

-"9#	c #1F1D08",

-"0#	c #918727",

-"a#	c #FEEB42",

-"b#	c #FAF660",

-"c#	c #FAFB62",

-"d#	c #0C0C05",

-"e#	c #E9E95A",

-"f#	c #8E8E36",

-"g#	c #ACAC42",

-"h#	c #AEAD42",

-"i#	c #DDDC53",

-"j#	c #DCDB53",

-"k#	c #5A5921",

-"l#	c #6F6E29",

-"m#	c #424218",

-"n#	c #E9E553",

-"o#	c #DFDB50",

-"p#	c #A5A33B",

-"q#	c #938F33",

-"r#	c #7E762A",

-"s#	c #26250D",

-"t#	c #DED94C",

-"u#	c #979433",

-"v#	c #807D2B",

-"w#	c #373512",

-"x#	c #FAF353",

-"y#	c #A29D34",

-"z#	c #504D19",

-"A#	c #F9EF4E",

-"B#	c #F9EF4D",

-"C#	c #E7DE47",

-"D#	c #827C28",

-"E#	c #343210",

-"F#	c #B1A935",

-"G#	c #F8DF48",

-"H#	c #96822B",

-"I#	c #25230B",

-"J#	c #373410",

-"K#	c #7A7323",

-"L#	c #F3E545",

-"M#	c #6F691F",

-"N#	c #423E12",

-"O#	c #4F4A16",

-"P#	c #5A5418",

-"Q#	c #B6AA31",

-"R#	c #B0A52F",

-"S#	c #FEE744",

-"T#	c #FCE754",

-"U#	c #161609",

-"V#	c #F4F45F",

-"W#	c #DADA54",

-"X#	c #D8D853",

-"Y#	c #828231",

-"Z#	c #BFBE48",

-"`#	c #5F5E24",

-" $	c #BAB945",

-".$	c #D7D54F",

-"+$	c #323212",

-"@$	c #878530",

-"#$	c #A6A33C",

-"$$	c #58571F",

-"%$	c #F3EC54",

-"&$	c #F4D246",

-"*$	c #454016",

-"=$	c #DBD64B",

-"-$	c #23220C",

-";$	c #FBF252",

-">$	c #57541C",

-",$	c #4D4A18",

-"'$	c #56531B",

-")$	c #BEB73B",

-"!$	c #938E2E",

-"~$	c #817C27",

-"{$	c #9C952F",

-"]$	c #A19A31",

-"^$	c #F6E348",

-"/$	c #C8AC39",

-"($	c #D9CC40",

-"_$	c #E4D842",

-":$	c #F2E545",

-"<$	c #FFE346",

-"[$	c #FEDB4A",

-"}$	c #EDEF5E",

-"|$	c #CBCB4F",

-"1$	c #131307",

-"2$	c #97973B",

-"3$	c #A1A13E",

-"4$	c #8E8E37",

-"5$	c #333313",

-"6$	c #ABAA40",

-"7$	c #A1A03C",

-"8$	c #414118",

-"9$	c #646325",

-"0$	c #595821",

-"a$	c #575620",

-"b$	c #4E4D1C",

-"c$	c #C9C749",

-"d$	c #6E6C27",

-"e$	c #656323",

-"f$	c #675B1E",

-"g$	c #BFAE3C",

-"h$	c #C5C143",

-"i$	c #B5B03E",

-"j$	c #3E3D15",

-"k$	c #D7D148",

-"l$	c #FCED4B",

-"m$	c #FEEA4A",

-"n$	c #FCED58",

-"o$	c #C5C64E",

-"p$	c #77782F",

-"q$	c #95963A",

-"r$	c #A4A440",

-"s$	c #B4B445",

-"t$	c #C7C74C",

-"u$	c #CECD4E",

-"v$	c #F4F35C",

-"w$	c #F1F05A",

-"x$	c #EFED58",

-"y$	c #FEE54E",

-"z$	c #FEE14C",

-"A$	c #8B8830",

-"B$	c #434117",

-"C$	c #58561E",

-"D$	c #969232",

-"E$	c #FEE74A",

-"F$	c #FBF75B",

-"G$	c #FDE951",

-"H$	c #E0DA4D",

-"I$	c #EFE951",

-"J$	c #FCF453",

-"K$	c #FCF04E",

-"L$	c #FCEE4C",

-"M$	c #FDEB4B",

-"N$	c #FFDD49",

-"O$	c #FFE249",

-"P$	c #FEE148",

-"Q$	c #FEDF48",

-"R$	c #FEDE48",

-"S$	c #FAF961",

-"T$	c #FDEC52",

-"U$	c #FCF255",

-"V$	c #FCEF53",

-"W$	c #FCEE52",

-"X$	c #FCEC51",

-"Y$	c #FDEA50",

-"Z$	c #FDE84F",

-"`$	c #FEE74E",

-" %	c #FEE34C",

-".%	c #FEE14B",

-"+%	c #FEDF4A",

-"@%	c #FBF15B",

-"#%	c #FAFA62",

-"$%	c #FBF65E",

-"%%	c #FBF45C",

-"&%	c #FBF25A",

-"*%	c #FCEF58",

-"=%	c #FCED56",

-"-%	c #FCEB54",

-";%	c #FDE953",

-">%	c #FDE751",

-",%	c #FDE550",

-"'%	c #FCE24E",

-")%	c #FDDE4B",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                          . . .         ",

-"                                                                          . . . . + + + @ . . . . . . . # $ % .         ",

-"                                          . . . . . & . @ . . . . . . + . * = - ; > , ' ) ! ~ { ] ^ / ( _ _ : .         ",

-"          + . . . + + + + . . . . . . . # < [ } | 1 2 3 4 5 6 7 8 9 0 - a b c c d e e f g h i j k l l ( _ _ m $ .       ",

-"      . n o p q r s t u v w x y . z A B C D D E F F G H H I I J K K L M M b c c d e e f g h i j k l l ( _ _ m N .       ",

-"    . o O O P Q Q R R S T U V W . X Y B C D D E F F G H H I I J K K L Z ` b c c d e e f g h i j k l l ( _ _ m  ..       ",

-"    . ..O O P Q Q R R S T U V +.. @.Y B C D D E F F G H H I I J K K L #.. $.c c d e e f g h i j k l l ( _ _ m %.&..     ",

-"    + *.O O P Q Q R R S T U V =.-.;.Y B C D D E F F G H H I I J K K L >.. ,.c c d e e f g h i j k l l ( _ _ m %.'..     ",

-"    . ).O O P Q Q R R S T U V =.!.~.Y B C D D E F F G H H I I J K K L {.].$.c c d e e f g h i j k l l ( _ _ m %.^./..   ",

-"    . (._._.:.<.<.[.R R S U U V }.w |.B 1.C D 2.E F F 3.H H I J J K L L {.b $.c d 4.e f f h i i k l l ( _ _ m %.%.5..   ",

-"  . o 6._._.:.<.<.[.R R S U U V 7.7.|.B 1.C D 2.E F F 3.H H I J J K L L {.b $.c d 4.e f f h i i k l l ( _ _ m %.%.8..   ",

-"  + 9.6._._.:.<.<.[.R R S U U V 7.7.|.B 1.C D 2.E F F 3.H H I J J K L L {.0.- c d 4.e f f h i i k l l ( _ _ m %.%.a.% . ",

-"  . b.6._._.:.<.<.[.R R S U U V 7.+.c.d.1.C D 2.E F F 3.H H I J J K L L {.e.. f.g.h.e f i.j.k.l.m.n.o.p.q.r.m %.%.a.s.. ",

-"  . t.6._._.:.<.<.[.[.R S u.U V v.7.[ w.1.C C 2.E x.y.z.A.B.C.D.E.J F.G.H.I.J.K.L.M.4.N.O.P.Q.R.S.T.U.V.W.X._ Y.Y.%.'.. ",

-". Z.`.6._._.:.<.<.[.[.R S u.U V v.7.@..  +C C 2.E E .+++@+#+$+%+&+J *+=+-+;+>+,+'+)+4.!+~+{+]+^+/+(+T._+:+<+_ Y.Y.%.[+. ",

-". }+`.6._._.:.<.<.[.[.R S u.U V v.7.|.|+1+C C 2.E 2+3+4+5+6+7+8+9+J 0+a+b+c+d+e+f+g+4.h+f i+h i j+k k l k+k+_ Y.Y.%.5.+ ",

-". l+`.6._._.:.<.<.[.[.R S u.U V v.7.|.m+. n+C 2.E o+F 3.3.H H p+J J q+L L {.$.>.& r+s+h+f i+h t+u+v+w+x+y+k+_ Y.Y.%.z+. ",

-". l+`.6._._.:.<.<.[.[.R S u.U V v.7.|.A+B+C+D+2.E E F 3.3.H H E+F+G+H+I+J+K+$.$.L+M+N+O+f i+h P+Q+k k R+S+T+_ Y.Y.%.$ . ",

-". U+`.6._._.V+W+X+Y+Z+`+ @u.U V v.7.|.A+.@n +@2.E E F 3.3.H H @@#@J $@%@L J+&@$.*@=@-@;@f i+>@,@'@k k l )@!@_ Y.Y.~@.   ",

-"  . t.6._._.{@]@^@/@(@_@:@u.U V <@[@|.A+1.}@|@1@2@3@4@5@6@7@8@9@0@J a@b@L c@d@$.e@f@g@h@i@i+j@k@j+k l@m@n@o@p@Y.Y.q@+   ",

-"  . r@s@t@t@O u@v@Q w@x@y@S z@A@B@C@D@A+E@F@G@H@I@J@K@5@G L@M@N@O@J P@Q@L {.b $.R@S@T@U@V@f W@X@Y@k k l Z@`@_  #Y..#+   ",

-"  + +#s@t@t@O @###$#%#&#*#S =#-#V ;#>#A+,#'#)#!#~#{#]#^#/#(#_#N@J J :#<#L {.b [#}#|#1#2#3#4#h 5#6#7#k 8#9#0#_  #a#@     ",

-"    . b#s@s@_.c#d#e#f#g#h#i#j#-#k#l#m#n#o#p#q#r#s#t#E u#v#w#x#N@p+J y#z#A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#_  #S#.     ",

-"    + T#s@s@_.c#U#V#W#X#Y#Z#`# $V .$+$@$#$$$%$&$*$=$E ]#-$5@H N@;$>$,$F+'$)$!$~${$]$^$/$($_$:$h i k k l k+k+_  #<$+     ",

-"      [$:.s@}$|$1$2$3$4$5$6$7$8$9$0$a$b$c$d$e$f$g$h$i$F j$k$H N@p+J K K L {.{.$.c c l$. m$f h h i k k l k+k+_  #z++     ",

-"      . n$s@o$p$q$r$s$t$u$v$S w$x$V =.A+A+B C y$z$A$B$C$D$3.H N@p+J K K L {.{.$.c c 4.. E$f h h i k k l k+k+_ Y..#+     ",

-"      . U+s@_.c#c#<.<.Q R R S T U V =.F$A+B 1.G$C+D H$I$F 3.3.J$p+p+J K q+L {.K$>.L$M$N$O$E$' , > P$Q$R$% # + . . .     ",

-"        . S$_.c#c#<.<.Q R R S T U V =.F$A+B 1.T$. U$V$W$X$Y$Z$`$1  %.%+%< N$. . . . . . . . . + . + @ . +               ",

-"        . @%_.#%[.$%%%&%*%=%-%;%>%,%'%|+)%< + . . . . . . . + + + + . + .                                               ",

-"        n C+n . . . . . . @ + + & . + . . .                                                                             ",

-"          .                                                                                                             ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        ",

-"                                                                                                                        "};

diff --git a/pixmaps/EasyTAG_icon.xpm b/pixmaps/EasyTAG_icon.xpm
new file mode 100755
index 0000000..d27b0da
--- /dev/null
+++ b/pixmaps/EasyTAG_icon.xpm
@@ -0,0 +1,1240 @@
+/* XPM */
+static char * EasyTAG_icon_xpm[] = {
+"64 64 1173 2",
+"  	c None",
+". 	c #FFD547",
+"+ 	c #FFD648",
+"@ 	c #FFD647",
+"# 	c #FFD548",
+"$ 	c #FFD748",
+"% 	c #FFD747",
+"& 	c #FFD848",
+"* 	c #FEDA48",
+"= 	c #FEDC48",
+"- 	c #FEDD47",
+"; 	c #FEE047",
+"> 	c #FEE147",
+", 	c #FEE246",
+"' 	c #FEE546",
+") 	c #FEE646",
+"! 	c #FEE645",
+"~ 	c #FEDD46",
+"{ 	c #FFD849",
+"] 	c #FEDA49",
+"^ 	c #FEDC49",
+"/ 	c #FCDB48",
+"( 	c #FCD847",
+"_ 	c #FEE04A",
+": 	c #FDE54B",
+"< 	c #FEE64B",
+"[ 	c #FEE84A",
+"} 	c #FEEA4A",
+"| 	c #FDEB4A",
+"1 	c #FDED4A",
+"2 	c #FDEF49",
+"3 	c #FDF048",
+"4 	c #FDEF48",
+"5 	c #FDEF47",
+"6 	c #FDEE47",
+"7 	c #FCED46",
+"8 	c #FDED45",
+"9 	c #FDEC44",
+"0 	c #FCEB44",
+"a 	c #FEE345",
+"b 	c #FFD947",
+"c 	c #FFD649",
+"d 	c #FED94A",
+"e 	c #FEDC4B",
+"f 	c #FEDE4C",
+"g 	c #FDE24E",
+"h 	c #FDE450",
+"i 	c #FDE651",
+"j 	c #FDE852",
+"k 	c #FDEB51",
+"l 	c #FDED52",
+"m 	c #FDF051",
+"n 	c #FCF251",
+"o 	c #FCF351",
+"p 	c #FCF350",
+"q 	c #F8EC4D",
+"r 	c #F2D144",
+"s 	c #FBF14D",
+"t 	c #FCF04C",
+"u 	c #FCF04B",
+"v 	c #FBEF4A",
+"w 	c #FBEF49",
+"x 	c #FCF048",
+"y 	c #FCEF48",
+"z 	c #FBEE47",
+"A 	c #FBEE46",
+"B 	c #FBED46",
+"C 	c #FCED45",
+"D 	c #FCED44",
+"E 	c #FCEC43",
+"F 	c #FDEC43",
+"G 	c #FDE743",
+"H 	c #FFD546",
+"I 	c #FED648",
+"J 	c #FED94B",
+"K 	c #FEDC4D",
+"L 	c #FEDF4F",
+"M 	c #FDE351",
+"N 	c #FDE654",
+"O 	c #FCE958",
+"P 	c #FCEB5D",
+"Q 	c #FBE65B",
+"R 	c #F9D953",
+"S 	c #FCEC62",
+"T 	c #FBF669",
+"U 	c #FBF869",
+"V 	c #FBF86A",
+"W 	c #FBF868",
+"X 	c #FBF767",
+"Y 	c #FBF765",
+"Z 	c #FBF761",
+"` 	c #FAF55F",
+" .	c #FAF45B",
+"..	c #FAF457",
+"+.	c #FBF454",
+"@.	c #FBF353",
+"#.	c #FAF352",
+"$.	c #FBF351",
+"%.	c #FBF350",
+"&.	c #FAF250",
+"*.	c #FAF04F",
+"=.	c #EECE42",
+"-.	c #FDE44B",
+";.	c #FAF14D",
+">.	c #FBF04C",
+",.	c #FBF04B",
+"'.	c #FCEF4B",
+").	c #FCEF4A",
+"!.	c #FCEF49",
+"~.	c #FCEE47",
+"{.	c #FCEE46",
+"].	c #FDEE45",
+"^.	c #FDED44",
+"/.	c #FCEB43",
+"(.	c #FFD847",
+"_.	c #FFDA4B",
+":.	c #FBF570",
+"<.	c #FCF87D",
+"[.	c #FAFA81",
+"}.	c #FAFA84",
+"|.	c #FBFB86",
+"1.	c #FBFB88",
+"2.	c #FBFB89",
+"3.	c #FAFA85",
+"4.	c #F9EF78",
+"5.	c #F1D763",
+"6.	c #FDF072",
+"7.	c #FAF775",
+"8.	c #FBF871",
+"9.	c #FBF86E",
+"0.	c #FAF668",
+"a.	c #F9F664",
+"b.	c #F9F661",
+"c.	c #F9F45D",
+"d.	c #F9F45A",
+"e.	c #F9F456",
+"f.	c #FAF454",
+"g.	c #FAF353",
+"h.	c #FBF352",
+"i.	c #FBF250",
+"j.	c #EDCE42",
+"k.	c #FEE24A",
+"l.	c #FBF14E",
+"m.	c #FCF14D",
+"n.	c #FCF14C",
+"o.	c #FCF04A",
+"p.	c #FCEE49",
+"q.	c #FDEE46",
+"r.	c #FDEC42",
+"s.	c #FDEB42",
+"t.	c #FEE045",
+"u.	c #FDDE4F",
+"v.	c #F9FA83",
+"w.	c #FBFC99",
+"x.	c #FAFC96",
+"y.	c #FBFC93",
+"z.	c #FBFC90",
+"A.	c #FAFB8E",
+"B.	c #FAFA8A",
+"C.	c #FAFA86",
+"D.	c #FAF57A",
+"E.	c #EDD55F",
+"F.	c #FDEE70",
+"G.	c #FBF773",
+"H.	c #FBF76B",
+"I.	c #FAF766",
+"J.	c #FAF763",
+"K.	c #FAF660",
+"L.	c #FAF55C",
+"M.	c #FAF55A",
+"N.	c #F9F556",
+"O.	c #FBF453",
+"P.	c #FBF34F",
+"Q.	c #FBF24F",
+"R.	c #ECD244",
+"S.	c #FEDF49",
+"T.	c #FCF14B",
+"U.	c #FCF049",
+"V.	c #FCEF47",
+"W.	c #FCEE45",
+"X.	c #FDED43",
+"Y.	c #FEE843",
+"Z.	c #FCE352",
+"`.	c #FAFA89",
+" +	c #FAFC98",
+".+	c #FBFC96",
+"++	c #FBFB8F",
+"@+	c #FBFB8C",
+"#+	c #FAFA87",
+"$+	c #FAFA82",
+"%+	c #FAF97F",
+"&+	c #FAF87B",
+"*+	c #ECD45D",
+"=+	c #FDEB6D",
+"-+	c #FBF873",
+";+	c #FBF86F",
+">+	c #FBF86C",
+",+	c #FAF669",
+"'+	c #FAF765",
+")+	c #FAF762",
+"!+	c #FAF559",
+"~+	c #FAF556",
+"{+	c #FAF555",
+"]+	c #EBD544",
+"^+	c #FFDB47",
+"/+	c #FAF04D",
+"(+	c #FCED47",
+"_+	c #FCEA42",
+":+	c #FEDF46",
+"<+	c #FCE857",
+"[+	c #F9FA97",
+"}+	c #FBFC98",
+"|+	c #FBFC94",
+"1+	c #FBFC91",
+"2+	c #FAF97C",
+"3+	c #EDD65E",
+"4+	c #FEE76A",
+"5+	c #FBF872",
+"6+	c #FBF86B",
+"7+	c #FAF769",
+"8+	c #FAF764",
+"9+	c #FAF65A",
+"0+	c #FAF557",
+"a+	c #FBF252",
+"b+	c #EBD846",
+"c+	c #FFDB48",
+"d+	c #FCED4C",
+"e+	c #FDEC41",
+"f+	c #FDEB41",
+"g+	c #FEE642",
+"h+	c #FFD749",
+"i+	c #FBF26D",
+"j+	c #FBFC97",
+"k+	c #FBFB8E",
+"l+	c #FBFB8A",
+"m+	c #FBFB87",
+"n+	c #FAF97D",
+"o+	c #FAF97B",
+"p+	c #EBD75E",
+"q+	c #FEE365",
+"r+	c #FBF86D",
+"s+	c #FAF65B",
+"t+	c #FAF656",
+"u+	c #FBF452",
+"v+	c #FBF24E",
+"w+	c #F4E64A",
+"x+	c #FEE349",
+"y+	c #FCED4B",
+"z+	c #FCEF46",
+"A+	c #FDEE44",
+"B+	c #FDED42",
+"C+	c #FEEB41",
+"D+	c #FEDC46",
+"E+	c #FFD94B",
+"F+	c #F9F98C",
+"G+	c #FBFC95",
+"H+	c #FBFB93",
+"I+	c #FAFA83",
+"J+	c #FAFA80",
+"K+	c #FAF979",
+"L+	c #EBDC62",
+"M+	c #FFE063",
+"N+	c #FBF66E",
+"O+	c #FAF767",
+"P+	c #FAF658",
+"Q+	c #FAF657",
+"R+	c #FAF456",
+"S+	c #FAF554",
+"T+	c #FBF150",
+"U+	c #F9EE4B",
+"V+	c #EEE347",
+"W+	c #FDEB40",
+"X+	c #FEE342",
+"Y+	c #FBE663",
+"Z+	c #FAFB99",
+"`+	c #FBFC92",
+" @	c #FBFB8B",
+".@	c #FAFA7F",
+"+@	c #FAF978",
+"@@	c #F7F170",
+"#@	c #FCF36F",
+"$@	c #FAF76A",
+"%@	c #FAF65D",
+"&@	c #F6F154",
+"*@	c #E4DE4C",
+"=@	c #F8F153",
+"-@	c #928C2C",
+";@	c #898329",
+">@	c #E7DB43",
+",@	c #E3D841",
+"'@	c #D3C93C",
+")@	c #DED23F",
+"!@	c #B3A932",
+"~@	c #C8BD37",
+"{@	c #A3982C",
+"]@	c #DED03C",
+"^@	c #8A8125",
+"/@	c #827922",
+"(@	c #A59A2B",
+"_@	c #9D9228",
+":@	c #8A8023",
+"<@	c #DFCD38",
+"[@	c #FBF486",
+"}@	c #FAFC99",
+"|@	c #FBFB91",
+"1@	c #FAF97E",
+"2@	c #F9F977",
+"3@	c #FBF975",
+"4@	c #E8E665",
+"5@	c #929038",
+"6@	c #A6A33B",
+"7@	c #78762A",
+"8@	c #807E2D",
+"9@	c #87852F",
+"0@	c #9F9C37",
+"a@	c #F5F054",
+"b@	c #706E26",
+"c@	c #827E2B",
+"d@	c #7F7B2A",
+"e@	c #F8F051",
+"f@	c #CEC742",
+"g@	c #E1DA48",
+"h@	c #DDD647",
+"i@	c #AAA436",
+"j@	c #AFA936",
+"k@	c #A6A034",
+"l@	c #F7EC4B",
+"m@	c #8C862A",
+"n@	c #868028",
+"o@	c #7B7524",
+"p@	c #F9ED49",
+"q@	c #7A7323",
+"r@	c #7F7924",
+"s@	c #726C20",
+"t@	c #948C2A",
+"u@	c #6E681E",
+"v@	c #CEC238",
+"w@	c #736C1F",
+"x@	c #D5C838",
+"y@	c #766F1F",
+"z@	c #938A27",
+"A@	c #B4A72E",
+"B@	c #C7BA33",
+"C@	c #6C651C",
+"D@	c #908624",
+"E@	c #B9AB2E",
+"F@	c #FEE143",
+"G@	c #FFDA55",
+"H@	c #FAFA9A",
+"I@	c #FBFB8D",
+"J@	c #FAF97A",
+"K@	c #FAF975",
+"L@	c #FBF973",
+"M@	c #FBF870",
+"N@	c #FAF863",
+"O@	c #7E7D2D",
+"P@	c #BFBB44",
+"Q@	c #8B8930",
+"R@	c #BBB841",
+"S@	c #F8F356",
+"T@	c #7A7729",
+"U@	c #C9C544",
+"V@	c #B3B03D",
+"W@	c #84802C",
+"X@	c #A39E35",
+"Y@	c #999431",
+"Z@	c #686521",
+"`@	c #DFD746",
+" #	c #646120",
+".#	c #D0C841",
+"+#	c #6C6821",
+"@#	c #B9A936",
+"##	c #8A7D28",
+"$#	c #E8DD45",
+"%#	c #746E22",
+"&#	c #A9A031",
+"*#	c #A59D2F",
+"=#	c #9B932C",
+"-#	c #B0A632",
+";#	c #8C8527",
+">#	c #B2A730",
+",#	c #756E20",
+"'#	c #E6D83E",
+")#	c #746D1F",
+"!#	c #948A27",
+"~#	c #9A8F28",
+"{#	c #EADA3C",
+"]#	c #6A631B",
+"^#	c #AEA12C",
+"/#	c #BFB130",
+"(#	c #FEE641",
+"_#	c #FDEA75",
+":#	c #FAFB9A",
+"<#	c #FAF976",
+"[#	c #FBF972",
+"}#	c #FAF869",
+"|#	c #FAF75A",
+"1#	c #918E33",
+"2#	c #B9B642",
+"3#	c #989635",
+"4#	c #AFAC3D",
+"5#	c #88862F",
+"6#	c #B4B13D",
+"7#	c #D2CE47",
+"8#	c #ECE64F",
+"9#	c #6B6823",
+"0#	c #E5DF4C",
+"a#	c #84802B",
+"b#	c #676421",
+"c#	c #DED646",
+"d#	c #6E6A23",
+"e#	c #EBE349",
+"f#	c #757024",
+"g#	c #AE9B31",
+"h#	c #6F601F",
+"i#	c #A49C31",
+"j#	c #615C1D",
+"k#	c #EBE045",
+"l#	c #8C8529",
+"m#	c #847E26",
+"n#	c #8B8427",
+"o#	c #918929",
+"p#	c #938B29",
+"q#	c #A59B2D",
+"r#	c #BEB234",
+"s#	c #9C922A",
+"t#	c #E2D43C",
+"u#	c #B3A72F",
+"v#	c #BCAF31",
+"w#	c #EDDD3D",
+"x#	c #D3C435",
+"y#	c #FDEA3F",
+"z#	c #FCE83F",
+"A#	c #FFD64A",
+"B#	c #FCF591",
+"C#	c #FAFB87",
+"D#	c #FAFA7E",
+"E#	c #FAF974",
+"F#	c #FAF75C",
+"G#	c #F3D646",
+"H#	c #978A2F",
+"I#	c #A19E39",
+"J#	c #908E33",
+"K#	c #9A9736",
+"L#	c #757228",
+"M#	c #E7E34F",
+"N#	c #706D26",
+"O#	c #999433",
+"P#	c #7D7A29",
+"Q#	c #F8F152",
+"R#	c #C2BC3F",
+"S#	c #827E2A",
+"T#	c #969030",
+"U#	c #918C2E",
+"V#	c #8B862C",
+"W#	c #ABA535",
+"X#	c #9D9630",
+"Y#	c #B0A334",
+"Z#	c #E4C440",
+"`#	c #C7B63A",
+" $	c #D3C93F",
+".$	c #F2E747",
+"+$	c #FDEC40",
+"@$	c #FDEA40",
+"#$	c #FDEA3E",
+"$$	c #FCE93E",
+"%$	c #FFDB46",
+"&$	c #FFDC60",
+"*$	c #FBFC9A",
+"=$	c #FBFB90",
+"-$	c #FAFA7D",
+";$	c #FBF970",
+">$	c #F9F65B",
+",$	c #ECD144",
+"'$	c #95812B",
+")$	c #B1AF3E",
+"!$	c #B8B53F",
+"~$	c #E1DB4D",
+"{$	c #FAF354",
+"]$	c #EDE74F",
+"^$	c #FBF14C",
+"/$	c #F8EC4B",
+"($	c #EFD142",
+"_$	c #FEDE47",
+":$	c #FCEB49",
+"<$	c #FDEC46",
+"[$	c #FDE942",
+"}$	c #FFDF44",
+"|$	c #FDE871",
+"1$	c #FAFC9A",
+"2$	c #FAFC97",
+"3$	c #FAFA7C",
+"4$	c #FAF973",
+"5$	c #FAF85F",
+"6$	c #FAF75B",
+"7$	c #EFE14E",
+"8$	c #F9D747",
+"9$	c #FCEB53",
+"0$	c #EAD643",
+"a$	c #FDEA49",
+"b$	c #FBEC4C",
+"c$	c #D1C54B",
+"d$	c #EFE15B",
+"e$	c #FCEF65",
+"f$	c #CCC25D",
+"g$	c #FDF06D",
+"h$	c #FDF06E",
+"i$	c #FEEF71",
+"j$	c #FFE14E",
+"k$	c #FDED79",
+"l$	c #FAF970",
+"m$	c #F8F860",
+"n$	c #FAF85C",
+"o$	c #ECCC43",
+"p$	c #FEDF4A",
+"q$	c #FBF354",
+"r$	c #F6EB4A",
+"s$	c #E5C73F",
+"t$	c #FEDF48",
+"u$	c #CDC23A",
+"v$	c #B0A732",
+"w$	c #FDEF4E",
+"x$	c #FDEF57",
+"y$	c #C8BE54",
+"z$	c #555338",
+"A$	c #504E38",
+"B$	c #4F4D3B",
+"C$	c #6E6B45",
+"D$	c #535040",
+"E$	c #F3E66B",
+"F$	c #FFDD45",
+"G$	c #FCF07F",
+"H$	c #FAFC95",
+"I$	c #FBFC8F",
+"J$	c #FAFB85",
+"K$	c #FAFA75",
+"L$	c #F9F865",
+"M$	c #F9F85D",
+"N$	c #F9F85B",
+"O$	c #FAF759",
+"P$	c #EDDB4A",
+"Q$	c #FBD847",
+"R$	c #FBEE53",
+"S$	c #F9F555",
+"T$	c #C3BC3D",
+"U$	c #6B6722",
+"V$	c #5C581C",
+"W$	c #4B4817",
+"X$	c #423F14",
+"Y$	c #2A290D",
+"Z$	c #25230B",
+"`$	c #26210A",
+" %	c #E7C641",
+".%	c #FDEB49",
+"+%	c #373410",
+"@%	c #121105",
+"#%	c #DDD13F",
+"$%	c #FCEF4E",
+"%%	c #FDF05C",
+"&%	c #FDF060",
+"*%	c #CFC555",
+"=%	c #454332",
+"-%	c #858046",
+";%	c #FAEC66",
+">%	c #EADE64",
+",%	c #918B4F",
+"'%	c #403F3C",
+")%	c #B8AF5C",
+"!%	c #FEF070",
+"~%	c #FDED69",
+"{%	c #FFDB45",
+"]%	c #FAF284",
+"^%	c #FAFB7F",
+"/%	c #FAFA70",
+"(%	c #F9F963",
+"_%	c #F9F95E",
+":%	c #F9F85C",
+"<%	c #FAF85B",
+"[%	c #F9F258",
+"}%	c #FEE14B",
+"|%	c #6C6822",
+"1%	c #171607",
+"2%	c #696621",
+"3%	c #524F19",
+"4%	c #030301",
+"5%	c #A59E32",
+"6%	c #8D872A",
+"7%	c #171507",
+"8%	c #887526",
+"9%	c #FEE248",
+"0%	c #ECE044",
+"a%	c #201E09",
+"b%	c #0E0D06",
+"c%	c #847E38",
+"d%	c #FCF05D",
+"e%	c #FDF05F",
+"f%	c #FDF061",
+"g%	c #726E3D",
+"h%	c #444233",
+"i%	c #F4E763",
+"j%	c #FDF067",
+"k%	c #FDF069",
+"l%	c #FDF06B",
+"m%	c #8A8550",
+"n%	c #847F50",
+"o%	c #FEED5F",
+"p%	c #FED947",
+"q%	c #FBF36D",
+"r%	c #F9F985",
+"s%	c #FAFC86",
+"t%	c #F9FB7F",
+"u%	c #DADA69",
+"v%	c #A8A94E",
+"w%	c #8D8D3B",
+"x%	c #797A2F",
+"y%	c #6B6B29",
+"z%	c #5D5D23",
+"A%	c #4F4F1E",
+"B%	c #676626",
+"C%	c #FAF659",
+"D%	c #FDD947",
+"E%	c #FBEF54",
+"F%	c #454216",
+"G%	c #7E7928",
+"H%	c #89832A",
+"I%	c #000000",
+"J%	c #D2C83F",
+"K%	c #968F2D",
+"L%	c #5A4F18",
+"M%	c #FFDC48",
+"N%	c #A89F31",
+"O%	c #403D13",
+"P%	c #535028",
+"Q%	c #4D4A2C",
+"R%	c #F9ED5E",
+"S%	c #F1E55E",
+"T%	c #424131",
+"U%	c #5B5839",
+"V%	c #FDF06A",
+"W%	c #FDF06C",
+"X%	c #F9EA6C",
+"Y%	c #E2D768",
+"Z%	c #FDF071",
+"`%	c #FDEA56",
+" &	c #FBEA56",
+".&	c #F8FA62",
+"+&	c #F9FB62",
+"@&	c #F9FB63",
+"#&	c #9FA03F",
+"$&	c #2A2A10",
+"%&	c #414119",
+"&&	c #79792E",
+"*&	c #5E5E24",
+"=&	c #151408",
+"-&	c #E1E054",
+";&	c #FAF758",
+">&	c #F9F055",
+",&	c #EDCD42",
+"'&	c #FDE34C",
+")&	c #F7F053",
+"!&	c #E3DD4A",
+"~&	c #D4CE45",
+"{&	c #BEB83E",
+"]&	c #747025",
+"^&	c #373511",
+"/&	c #EDE54A",
+"(&	c #9A932E",
+"_&	c #BDB539",
+":&	c #ECDA44",
+"<&	c #6B621F",
+"[&	c #7D7832",
+"}&	c #96903E",
+"|&	c #222220",
+"1&	c #BBB24C",
+"2&	c #E2D65B",
+"3&	c #32322E",
+"4&	c #706C40",
+"5&	c #E9DD6A",
+"6&	c #DED36A",
+"7&	c #FFE64E",
+"8&	c #FDE251",
+"9&	c #F7F962",
+"0&	c #F9FA62",
+"a&	c #F9F962",
+"b&	c #7F7F31",
+"c&	c #BEBE49",
+"d&	c #F9F95F",
+"e&	c #DDDD53",
+"f&	c #363514",
+"g&	c #7A7A2D",
+"h&	c #F4F158",
+"i&	c #D1CE4B",
+"j&	c #F2EE56",
+"k&	c #EAD245",
+"l&	c #AC9431",
+"m&	c #383613",
+"n&	c #3B3A14",
+"o&	c #494718",
+"p&	c #9B9634",
+"q&	c #24230C",
+"r&	c #020201",
+"s&	c #3A3813",
+"t&	c #FAF251",
+"u&	c #5D5A1D",
+"v&	c #777325",
+"w&	c #F9F04D",
+"x&	c #ADA635",
+"y&	c #A8A133",
+"z&	c #FAEA48",
+"A&	c #403E1D",
+"B&	c #BDB449",
+"C&	c #ECE157",
+"D&	c #393828",
+"E&	c #716D39",
+"F&	c #FDF161",
+"G&	c #D9CD59",
+"H&	c #2E2E2D",
+"I&	c #7A7543",
+"J&	c #FDF068",
+"K&	c #8C8650",
+"L&	c #545344",
+"M&	c #4C4B44",
+"N&	c #736F51",
+"O&	c #FFE047",
+"P&	c #FFD84B",
+"Q&	c #9C9D3D",
+"R&	c #BDBD49",
+"S&	c #2F2F12",
+"T&	c #F3F35C",
+"U&	c #E6E656",
+"V&	c #CECE4C",
+"W&	c #8E8C34",
+"X&	c #2C2C10",
+"Y&	c #22220C",
+"Z&	c #8C8A31",
+"`&	c #E5DA4B",
+" *	c #1C1908",
+".*	c #A7A138",
+"+*	c #CECA46",
+"@*	c #444217",
+"#*	c #CCC643",
+"$*	c #0F0E05",
+"%*	c #6D6A24",
+"&*	c #CDC641",
+"**	c #28270D",
+"=*	c #F7EE4E",
+"-*	c #C2B93B",
+";*	c #958F2D",
+">*	c #EADD4B",
+",*	c #2E2C1E",
+"'*	c #777236",
+")*	c #6F6B36",
+"!*	c #3E3C2A",
+"~*	c #3C3A2B",
+"{*	c #ECE15E",
+"]*	c #F6E962",
+"^*	c #4A4835",
+"/*	c #57553B",
+"(*	c #FCEE68",
+"_*	c #8C8653",
+":*	c #4C4B45",
+"<*	c #E7DA68",
+"[*	c #FFD946",
+"}*	c #FAF05A",
+"|*	c #AFAF44",
+"1*	c #98983B",
+"2*	c #929238",
+"3*	c #1C1C0B",
+"4*	c #E8E758",
+"5*	c #DDDB51",
+"6*	c #181709",
+"7*	c #C1BF45",
+"8*	c #504F1D",
+"9*	c #353413",
+"0*	c #A7A43A",
+"a*	c #060602",
+"b*	c #787529",
+"c*	c #D2CF48",
+"d*	c #D8D147",
+"e*	c #787528",
+"f*	c #4D4A19",
+"g*	c #2C2B0E",
+"h*	c #F2EA4E",
+"i*	c #8D882C",
+"j*	c #5E5B1E",
+"k*	c #FBF24D",
+"l*	c #D6CD42",
+"m*	c #857F28",
+"n*	c #FCF04E",
+"o*	c #A8A041",
+"p*	c #403E25",
+"q*	c #8C863B",
+"r*	c #A29B44",
+"s*	c #999344",
+"t*	c #292927",
+"u*	c #999348",
+"v*	c #FDF063",
+"w*	c #6C693F",
+"x*	c #353533",
+"y*	c #D0C55D",
+"z*	c #969157",
+"A*	c #515148",
+"B*	c #EBDB60",
+"C*	c #FCE050",
+"D*	c #FAFA61",
+"E*	c #F9FA61",
+"F*	c #C3C44C",
+"G*	c #23230D",
+"H*	c #21210D",
+"I*	c #0D0D05",
+"J*	c #DFDE53",
+"K*	c #E0DE51",
+"L*	c #626124",
+"M*	c #F6F359",
+"N*	c #F8F558",
+"O*	c #696725",
+"P*	c #20200B",
+"Q*	c #F4F055",
+"R*	c #ECE852",
+"S*	c #302F11",
+"T*	c #090903",
+"U*	c #302F10",
+"V*	c #87832D",
+"W*	c #9C9732",
+"X*	c #524F1A",
+"Y*	c #A29D33",
+"Z*	c #E0D745",
+"`*	c #0D0C04",
+" =	c #7C7625",
+".=	c #FCF04D",
+"+=	c #FCF157",
+"@=	c #6C6730",
+"#=	c #7B7536",
+"$=	c #FCEE5D",
+"%=	c #FCEF5F",
+"&=	c #FAEE5F",
+"*=	c #514F33",
+"==	c #5E5A38",
+"-=	c #FDEF65",
+";=	c #D0C65A",
+">=	c #414036",
+",=	c #7C7748",
+"'=	c #FAED6B",
+")=	c #FDF16E",
+"!=	c #F0E36B",
+"~=	c #68654C",
+"{=	c #4A4946",
+"]=	c #E1CD54",
+"^=	c #FBF15A",
+"/=	c #F8F961",
+"(=	c #F9F961",
+"_=	c #D5D653",
+":=	c #8B8B35",
+"<=	c #EDED5B",
+"[=	c #29290F",
+"}=	c #D4D34F",
+"|=	c #E6E655",
+"1=	c #F8F55A",
+"2=	c #EBE856",
+"3=	c #636224",
+"4=	c #28280E",
+"5=	c #191809",
+"6=	c #EBE852",
+"7=	c #E9E551",
+"8=	c #E1DD4E",
+"9=	c #908D31",
+"0=	c #5D5B20",
+"a=	c #111006",
+"b=	c #D7D147",
+"c=	c #F6ED50",
+"d=	c #4B4818",
+"e=	c #2D2C0E",
+"f=	c #EBE34A",
+"g=	c #E5DB46",
+"h=	c #6E6821",
+"i=	c #FCF156",
+"j=	c #F8ED58",
+"k=	c #3F3D24",
+"l=	c #8D813A",
+"m=	c #FFE15D",
+"n=	c #FCF060",
+"o=	c #FCF061",
+"p=	c #74703D",
+"q=	c #2E2E2C",
+"r=	c #9E974C",
+"s=	c #F9EC66",
+"t=	c #ADA555",
+"u=	c #4D4B3C",
+"v=	c #686446",
+"w=	c #817D4E",
+"x=	c #5C5A47",
+"y=	c #969059",
+"z=	c #6C6A50",
+"A=	c #D4BD49",
+"B=	c #FCE150",
+"C=	c #FAF960",
+"D=	c #DEDF56",
+"E=	c #0E0E05",
+"F=	c #7D7D30",
+"G=	c #8E8E35",
+"H=	c #DAD851",
+"I=	c #EBEA58",
+"J=	c #2F2F11",
+"K=	c #C9C749",
+"L=	c #313012",
+"M=	c #414017",
+"N=	c #DBD84E",
+"O=	c #84822F",
+"P=	c #E2DF4E",
+"Q=	c #5A581F",
+"R=	c #F8E54D",
+"S=	c #FCEA4F",
+"T=	c #BCB73F",
+"U=	c #131206",
+"V=	c #D4CE46",
+"W=	c #777326",
+"X=	c #100F05",
+"Y=	c #3D3B13",
+"Z=	c #F9EF4B",
+"`=	c #A9A234",
+" -	c #050501",
+".-	c #353310",
+"+-	c #ADA63D",
+"@-	c #F4EA55",
+"#-	c #65622E",
+"$-	c #1B1B1A",
+"%-	c #474325",
+"&-	c #B19D49",
+"*-	c #FCEF60",
+"=-	c #A6A04A",
+"--	c #4D4B32",
+";-	c #5D5A39",
+">-	c #66623E",
+",-	c #D4CA5D",
+"'-	c #E5DA65",
+")-	c #B2A95A",
+"!-	c #A29B58",
+"~-	c #DBD069",
+"{-	c #FEF073",
+"]-	c #F7E973",
+"^-	c #09D94D",
+"/-	c #FBF15B",
+"(-	c #F8F960",
+"_-	c #E6E659",
+":-	c #151508",
+"<-	c #72722B",
+"[-	c #F8F75C",
+"}-	c #55551F",
+"|-	c #313112",
+"1-	c #A3A13B",
+"2-	c #ACAA3E",
+"3-	c #F4F056",
+"4-	c #57561F",
+"5-	c #CFCC48",
+"6-	c #D5D049",
+"7-	c #121106",
+"8-	c #6E611F",
+"9-	c #C7B03A",
+"0-	c #57541D",
+"a-	c #413F15",
+"b-	c #E1DA49",
+"c-	c #7B7627",
+"d-	c #D4CB41",
+"e-	c #413E14",
+"f-	c #5D591E",
+"g-	c #736E2B",
+"h-	c #918C37",
+"i-	c #F2E855",
+"j-	c #8E883A",
+"k-	c #A09A41",
+"l-	c #B3A745",
+"m-	c #E7CB59",
+"n-	c #FDEC60",
+"o-	c #FBEF61",
+"p-	c #FDF164",
+"q-	c #FDF169",
+"r-	c #FDF16F",
+"s-	c #FEF071",
+"t-	c #FEF074",
+"u-	c #FEEE73",
+"v-	c #00D748",
+"w-	c #FCE251",
+"x-	c #F9F860",
+"y-	c #DEDE55",
+"z-	c #0F0F06",
+"A-	c #3F3F18",
+"B-	c #BDBD48",
+"C-	c #8B8B34",
+"D-	c #48481B",
+"E-	c #040401",
+"F-	c #605F23",
+"G-	c #DCD850",
+"H-	c #181708",
+"I-	c #3F3E17",
+"J-	c #3E3D16",
+"K-	c #474519",
+"L-	c #161508",
+"M-	c #29290E",
+"N-	c #86842E",
+"O-	c #53521D",
+"P-	c #8F8229",
+"Q-	c #463C14",
+"R-	c #817D2B",
+"S-	c #EFE94F",
+"T-	c #393712",
+"U-	c #CEC642",
+"V-	c #FCF14E",
+"W-	c #FCF150",
+"X-	c #FCF254",
+"Y-	c #FCF15A",
+"Z-	c #FCF15B",
+"`-	c #FCF15C",
+" ;	c #EFE056",
+".;	c #FCDD5F",
+"+;	c #FDEA62",
+"@;	c #FCF163",
+"#;	c #FDF066",
+"$;	c #FDF16A",
+"%;	c #FEF072",
+"&;	c #FDEB6A",
+"*;	c #00D648",
+"=;	c #FFD646",
+"-;	c #F2E957",
+";;	c #353615",
+">;	c #171709",
+",;	c #25250E",
+"';	c #3D3C17",
+");	c #4D4D1D",
+"!;	c #5A5A22",
+"~;	c #B9B844",
+"{;	c #B9B743",
+"];	c #6F6D28",
+"^;	c #918F34",
+"/;	c #F6F257",
+"(;	c #D6D24B",
+"_;	c #C5C245",
+":;	c #EBD948",
+"<;	c #FBF153",
+"[;	c #EDE64D",
+"};	c #D3CC44",
+"|;	c #383612",
+"1;	c #FBF151",
+"2;	c #FCF153",
+"3;	c #FCF155",
+"4;	c #FCF05C",
+"5;	c #F4E659",
+"6;	c #F5D85D",
+"7;	c #FDE861",
+"8;	c #FCF064",
+"9;	c #FDF064",
+"0;	c #FDEF6B",
+"a;	c #FEF06E",
+"b;	c #FEF16F",
+"c;	c #FDF074",
+"d;	c #FDEF75",
+"e;	c #FDE961",
+"f;	c #FBE151",
+"g;	c #DDDC54",
+"h;	c #EBEA5A",
+"i;	c #F8F85F",
+"j;	c #F9F95D",
+"k;	c #EDE04A",
+"l;	c #FCEE50",
+"m;	c #9D9833",
+"n;	c #2A290E",
+"o;	c #323110",
+"p;	c #908B2D",
+"q;	c #FBF14F",
+"r;	c #FAF14E",
+"s;	c #FAF14F",
+"t;	c #FAF051",
+"u;	c #FBF152",
+"v;	c #FBF156",
+"w;	c #FBF057",
+"x;	c #FBF058",
+"y;	c #FBF05E",
+"z;	c #F9ED5F",
+"A;	c #F0D45A",
+"B;	c #FEE762",
+"C;	c #FEF16A",
+"D;	c #FEF16C",
+"E;	c #FEF06D",
+"F;	c #FEF171",
+"G;	c #FEEF75",
+"H;	c #FEEE78",
+"I;	c #FFE459",
+"J;	c #FBF45C",
+"K;	c #F9F85F",
+"L;	c #F9F455",
+"M;	c #F2E54D",
+"N;	c #F6D445",
+"O;	c #FCEA4E",
+"P;	c #BEB93E",
+"Q;	c #3E3C14",
+"R;	c #837F2A",
+"S;	c #F8F04E",
+"T;	c #FBF052",
+"U;	c #FCF154",
+"V;	c #FDF155",
+"W;	c #FDF158",
+"X;	c #FDF159",
+"Y;	c #FDF25C",
+"Z;	c #FDF15C",
+"`;	c #FDF15D",
+" >	c #FDEF60",
+".>	c #EED35A",
+"+>	c #FFE464",
+"@>	c #FEEA63",
+"#>	c #FEE862",
+"$>	c #FEE662",
+"%>	c #FEE560",
+"&>	c #FEE25F",
+"*>	c #FEDF5D",
+"=>	c #FEDD5C",
+"->	c #FFDC5A",
+";>	c #FFD955",
+">>	c #FFD954",
+",>	c #FFD851",
+"'>	c #FCEB55",
+")>	c #F9F75E",
+"!>	c #F8F85E",
+"~>	c #F8F85D",
+"{>	c #F8F75D",
+"]>	c #F9F75B",
+"^>	c #F9F65A",
+"/>	c #F9F659",
+"(>	c #F9F557",
+"_>	c #FAF455",
+":>	c #F9ED51",
+"<>	c #F0CF43",
+"[>	c #FDE84E",
+"}>	c #FCF452",
+"|>	c #FCF24F",
+"1>	c #FDEE4E",
+"2>	c #FDEB4E",
+"3>	c #FDEA50",
+"4>	c #FEE750",
+"5>	c #FEE550",
+"6>	c #FEE350",
+"7>	c #FEE14F",
+"8>	c #FEDD4F",
+"9>	c #FFDC4F",
+"0>	c #FFD94F",
+"a>	c #FFD74C",
+"b>	c #FFD74B",
+"c>	c #FED848",
+"d>	c #F8F75E",
+"e>	c #F9F85E",
+"f>	c #F9F75C",
+"g>	c #FBF75A",
+"h>	c #FBF759",
+"i>	c #FBF758",
+"j>	c #FBF658",
+"k>	c #FBF657",
+"l>	c #FBF456",
+"m>	c #FCEE52",
+"n>	c #FCEC51",
+"o>	c #FAD746",
+"p>	c #FEE24C",
+"q>	c #FEDE4B",
+"r>	c #FEDB49",
+"s>	c #FFD949",
+"t>	c #FED84C",
+"u>	c #FAF75D",
+"v>	c #FBF65B",
+"w>	c #FBF359",
+"x>	c #FCEF57",
+"y>	c #FCEC55",
+"z>	c #FDE953",
+"A>	c #FDE751",
+"B>	c #FDE14E",
+"C>	c #FEDD4B",
+"D>	c #FFDA4A",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                        . + @ + + @ + + + + + + + @             ",
+"                                                              . @ + @ # $ % + + + + + + + @ & * = - ; > , ' ) ! ~ .             ",
+"                                      . @ . + $ @ + + + + + + + + { ] ^ / ( _ : < [ } | 1 2 3 4 4 5 6 7 8 8 9 0 a +             ",
+"              @ # + # . . + + + $ b @ + c d e f g h i j k l m n o o p p q r : s t t u v v w x y z A B C D D E F G +             ",
+"        H + + + I J K L M N O P Q R S T U V W X Y Z `  ...+.@.#.#.$.%.&.*.=.-.;.>.>.,.'.).).!.y y ~.{.{.].9 ^.F /.(.#           ",
+"        @ _.:.<.[.}.|.1.2.1.3.[.4.5.6.7.8.9.V 0.a.b.c.d.e.f.g.h.h.h.$.%.i.j.k.l.m.n.n.u o.o.p.y y ~.{.q.].^.^.r.s.t.+           ",
+"        + u.v.w.x.y.z.A.B.C.}.[.D.E.F.G.8.9.H.I.J.K.L.M.N.@.O.O.$.$.$.P.Q.R.S.s m.T.u u U.U.!.V.V.~.W.].].X.X.X.s.Y.$ .         ",
+"        + Z.`. +.+y.++@+2.#+$+%+&+*+=+-+;+>+,+'+)+` !+~+{++.O.O.h.$.$.i.Q.]+^+/+m.n.u u o.U.!.y V.(+{.].8 ^.X.X.s._+:+@         ",
+"        + <+[+}+|+1+++@+1.3.$+%+2+3+4+5+;+6+7+8+9+0+~+{+{++.O.O.a+$.$.i.Q.b+c+d+m.n.u u o.U.!.y V.~.A ].8 ^.X.X.e+f+g+$ @       ",
+"        h+i+w.j+|+1+k+l+m+3.[.n+o+p+q+5+r+V I.s+t+0+~+{+f.+.u+O.h.%.$.i.v+w+x+y+m.n.).o.o.y y y z+{.{.A+^.^.B+r.r.f+C+D+@       ",
+"      H E+F+w.G+H+++@+l+C.I+J+2+K+L+M+N+r+O+9+P+Q+R+~+S++.+.O.u+h.$.%.T+Q.v+l.s n.U+V+o.o.!.y y V.{.{.].9 ^.X.r.r.W+W+X++       ",
+"      . Y+Z+}+|+`+++ @2.3.$+.@o++@@@#@;+$@%@P+P+Q+~+~+&@*@=@O.u+h.$.%.i.Q.v+l.m.n.-@;@o.o.>@,@'@)@!@{.~@{@]@^@/@(@_@:@<@(.@     ",
+"      c [@}@j+y.|@k+l+1.}.[.1@o+2@3@8.4@5@6@7@8@9@0@a@b@c@d@O.h.e@f@g@h@i@j@k@l@m@n@o@U.p@q@r@s@t@u@v@w@x@y@z@A@B@C@D@E@F@+     ",
+"    . G@H@ +.+`+++I@1.C.I+.@n+J@K@L@M@N@O@P@Q@R@S@T@U@V@W@W@O.$.X@Y@Z@`@ #.#+#@###$#%#o.U.&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#+     ",
+"    @ _#:# +G+1+k+@+2.3.$+.@o+K+<#[#}#|#1#2#3#4#0+5#6#7#8#9#0#h.f@a#b#c#d#e#f#g#h#i#j#k#U.l#m#n#o#p#q#r#s#t#u#v#e+w#x#y#z#+ #   ",
+"    A#B#}@.+|+|@k+ @C#}.$+D#&++@E#>+F#G#H#I#J#Q@K#L#M#N#O#P#Q#a+R#S#T#U#V#W#X#Y#Z#`# $.$!.y y z+~.{.A+^.^.B+B+r.+$e+@$#$$$%$@   ",
+"  . &$*$ +.+y.=$@+2.#+I+.@-$K+<#;$>$|#,$'$K#)$!$~$~+S+{$]$u+u+h.%.%.i.v+v+l.^$/$($_$o.o.y y y V.{.{.].9 ^.X.r.r.e+9 :$<$[$}$+   ",
+"  + |$1$2$G+1+++@+1.3.$+.@3$K+4$5$6$|#7$8$9$P+Q+~+~+{++.+.O.u+h.$.%.T+Q.v+l.m.n.0$c+a$o.!.y y ~.{.{.].^.8 b$c$d$e$f$g$h$i$j$+   ",
+"  + k$}@2$|+1+k+ @C#3.$+D#o+l$m$n$s+|#9+o$p$P+Q+~+~+{+q$+.O.h.h.$.%.i.Q.v+l.m.n.r$s$t$o.p.u$v$~.{.6 w$x$y$z$A$B$C$D$E$h$i$F$.   ",
+"  + G$ +H$y.I$I@l+J$I+J+K$L$M$N$n$6$O$O$P$Q$R$0+{+{+S$O.O.O.$.$.$.P.T$U$V$W$X$Y$Z$`$ %.%!.+%@%#%$%%%&%*%=%-%;%>%,%'%)%!%~%{%+   ",
+"  + ]%2$H$`+k+ @2.^%/%(%_%M$M$:%<%6$|#O$[%=.}%0+~+{+{++.O.O.h.$.$.i.|%1%2%3%4%5%6%7%8%9%0%a%b%c%d%e%f%g%h%i%j%k%l%m%n%i$o%p%+   ",
+"  + q%r%s%t%u%v%w%x%y%z%A%B%M$:%6$6$|#O$C%b+D%E%~+{+{++.O.O.a+$.$.i.F%G%v+H%I%J%u K%L%M%N%O%P%Q%R%e%S%T%U%j%k%V%W%X%Y%Z%`%$ .   ",
+"  +  &.&+&@&#&$&I%%&&&*&$&=&-&n$6$|#|#;&C%>&,&'&~+S+f.)&!&~&{&&.V#]&^&/&v+(&I%_&).o.:&Q$<&[&}&|&1&e%2&3&4&j%k%V%W%E$5&6&7&+     ",
+"  + 8&9&0&+&a&b&I%c&d&e&e&f&g&n$|#h&i&j&P+P+k&l&m&n&o&p&q&r&s&t&u&4%v&w&l.x&I%y&u o.v z&A&B&C&D&E&F&G&H&I&J&V%l%K&L&M&N&O&+     ",
+"  # P&0&0&+&0&Q&I%R&d&S&T&U&V&n$W&X&X&Y&Z&P+`& *.*+*@*N##*$*%*$.&***=*v+l.-*I%;*u o.o.>*,*'*)*!*~*{*]*^*/*(*l%W%h$_*:*<*[*@     ",
+"    c }*.&0&0&|*I%1*2*3*4*M$:%5*6*7*|#8*9*Q+0*a*b*c*d*e*O.f*g*h*i*j*Q.k*s l*r&m*u U.n*o*p*q*r*s*t*u*v*w*x*y*l%g$h$z*A*B*$ .     ",
+"    c C*D*E*E*F*I%G*H*I*J*M$N$K*L*M*N*O*P*Q*R*S*I%T*U*V*O.X@r&W*X*Y*Q.v+/+Z*`* =u .=+=@=#=$=%=&=*===-=;=>=,='=)=!=~={=]=+       ",
+"    H h+^=/=(=_=r&:=<=[=}=M$|=1=2=3=4=G*5=6=7=8=9=0=P*a=b=c=U*d=e=f=Q.v+s g=@%h=t i=j=k=l=m=n=o=p=q=r=s=t=u=v=w=x=y=z=A=+       ",
+"      @ B=C=(=D=E=F=d&G=H=I=J=K=L=M=N=O=a=P=K#Q=R=S=T=U=V=h.W=X=Y=v+v+v+Z=`= -.-+-@-#-$-%-&-*-=---;->-,-k%'-)-!-~-{-]-^-@       ",
+"      H h+/-(-_-:-<-_%_%[-}-|-1-I%2-3-4-4%5-6-7-8-9-0-a-u+h.b-1%c-Q.v+l.d-e-f-g-h-i-j-k-l-m-n-o-p--=j%q-l%g$)=r-s-t-u-v-+       ",
+"        @ w-x-y-z-A-B-C-D-E-F-G-H-I-J-K-L-M-N-O-P-Q-R-S-u+h.$.T-U-Q.v+l.V-W-X-i=+=Y-Z-`- ;.;+;@;p-#;q-$;l%g$r-s-%;t-&;*;        ",
+"        =;h+-;;;>;,;[=';);!;~;6${;];^;/;(;_;~+~+:;c+<;O.h.[;};|;i.Q.v+1;2;X-3;+=+=Y-4;`-5;6;7;8;9;#;J&k%0;a;b;Z%c;d;e;+         ",
+"          . f;g;h;i;j;M$M$N$<%6$O$O$!+Q+Q+0+{+{+k;( l;O.m;n;o;p;q;r;s;t;u;<;v;w;x;Y-Z-y;z;A;B;9;#;J&C;D;E;r-F;{-G;H;I;+         ",
+"          . I J;K;d&_%M$M$:%<%6$|#O$C%P+0+N.L;L;M;N;O;#.P;Q;R;S;s;q;T+T;2;U;V;W;X;Y;Z;`; >.>+>@>#>$>%>&>*>=>->;>>>,>c +         ",
+"            + '>)>!>~>{>[-]>]>^>/>/>P+Q+(>R+_>f.:><>[>}>o p p |>n*1>2>3>4>5>6>7>8>9>0>a>b>c>(.+ + + + . + @ # . #               ",
+"            @ 8&d>e>M$f>f>6$|#g>h>i>j>k>l>U;m>n>[>o>p$p>q>r>s>h++ + + + + + + @ + + . @ #                                       ",
+"            @ t>u>v>w>x>y>z>A>h B>C>D>{ + + + + + $ % . $ @ + + @                                                               ",
+"            H + + + + + + + + + + + # + # @                                                                                     ",
+"              @ + =;                                                                                                            ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                "};
diff --git a/pixmaps/EasyTAG_logo.xpm b/pixmaps/EasyTAG_logo.xpm
index 8c09077..0503b89 100755
--- a/pixmaps/EasyTAG_logo.xpm
+++ b/pixmaps/EasyTAG_logo.xpm
@@ -1,2300 +1,4629 @@
 /* XPM */
 static char * EasyTAG_logo_xpm[] = {
-"287 150 2147 2",
+"290 150 4476 2",
 "  	c None",
-". 	c #FEDB49",
-"+ 	c #FFDB49",
-"@ 	c #FEDA49",
-"# 	c #FFDD48",
-"$ 	c #FFDE48",
-"% 	c #FFDF47",
-"& 	c #FFE047",
-"* 	c #FFE147",
-"= 	c #FFE246",
-"- 	c #FFE346",
-"; 	c #FEE445",
-"> 	c #FEE544",
-", 	c #FEE644",
-"' 	c #FEE743",
-") 	c #FEE843",
-"! 	c #FFE046",
-"~ 	c #FFDC49",
-"{ 	c #FFDF48",
-"] 	c #FEE048",
-"^ 	c #FEE147",
-"/ 	c #FEE247",
-"( 	c #FEE347",
-"_ 	c #FEE446",
-": 	c #FEE646",
-"< 	c #FEE746",
-"[ 	c #FEE845",
-"} 	c #FEE944",
-"| 	c #FEEA44",
-"1 	c #FEEB44",
-"2 	c #FEEC43",
-"3 	c #FEEC42",
-"4 	c #FEEC41",
-"5 	c #FFDE49",
-"6 	c #FFDF49",
-"7 	c #FEE148",
-"8 	c #FEE248",
-"9 	c #FEE448",
-"0 	c #FEE547",
-"a 	c #FEE647",
-"b 	c #FEE747",
-"c 	c #FEE847",
-"d 	c #FDEA47",
-"e 	c #FDEB46",
-"f 	c #FDEC45",
-"g 	c #FDED45",
-"h 	c #FDED44",
-"i 	c #FDED43",
-"j 	c #FEED43",
-"k 	c #FFDD49",
-"l 	c #FEE049",
-"m 	c #FEE149",
-"n 	c #FEE349",
-"o 	c #FEE449",
-"p 	c #FEE548",
-"q 	c #FEE648",
-"r 	c #FEE848",
-"s 	c #FEE948",
-"t 	c #FDEA48",
-"u 	c #FDEB48",
-"v 	c #FDED48",
-"w 	c #FDEE47",
-"x 	c #FDEF47",
-"y 	c #FDEE46",
-"z 	c #FDEE45",
-"A 	c #FEE942",
-"B 	c #FEDF49",
-"C 	c #FEE14A",
-"D 	c #FEE34A",
-"E 	c #FEE44A",
-"F 	c #FEE54A",
-"G 	c #FDE74A",
-"H 	c #FDE84A",
-"I 	c #FDE94A",
-"J 	c #FEEB4A",
-"K 	c #FDEC4A",
-"L 	c #FDED4A",
-"M 	c #FDEF4A",
-"N 	c #FDF04A",
-"O 	c #FDF049",
-"P 	c #FDEF49",
-"Q 	c #FDEF48",
-"R 	c #FFDD4A",
-"S 	c #FEDF4A",
-"T 	c #FDE84B",
-"U 	c #FDEA4C",
-"V 	c #FDEB4B",
-"W 	c #FDED4B",
-"X 	c #FCEE4C",
-"Y 	c #FCEF4C",
-"Z 	c #FCF14C",
-"` 	c #FCF04C",
-" .	c #FCF04B",
-"..	c #FCF04A",
-"+.	c #FFDF4A",
-"@.	c #FEE04B",
-"#.	c #FEE24B",
-"$.	c #FEE34B",
-"%.	c #FEE44B",
-"&.	c #FEE64C",
-"*.	c #FDE74C",
-"=.	c #FDE94D",
-"-.	c #FDEA4D",
-";.	c #FDEC4D",
-">.	c #FDED4E",
-",.	c #FCEF4D",
-"'.	c #FCF04E",
-").	c #FCF14E",
-"!.	c #FCF24E",
-"~.	c #FCF14D",
-"{.	c #FEE34C",
-"].	c #FDE54D",
-"^.	c #FDE64D",
-"/.	c #FDE84D",
-"(.	c #FDE94E",
-"_.	c #FCEB4E",
-":.	c #FDEC4F",
-"<.	c #FDEE4F",
-"[.	c #FCEF50",
-"}.	c #FCF150",
-"|.	c #FCF250",
-"1.	c #FCF350",
-"2.	c #FCF24F",
-"3.	c #FFDE4A",
-"4.	c #FEDF4B",
-"5.	c #FEE24C",
-"6.	c #FEE34D",
-"7.	c #FDE64E",
-"8.	c #FDE84F",
-"9.	c #FDE94F",
-"0.	c #FCEB4F",
-"a.	c #FCED50",
-"b.	c #FCEE51",
-"c.	c #FCF051",
-"d.	c #FBF152",
-"e.	c #FBF353",
-"f.	c #FBF452",
-"g.	c #FBF352",
-"h.	c #FBF351",
-"i.	c #FCF351",
-"j.	c #FEE54B",
-"k.	c #FEDE4B",
-"l.	c #FEE04C",
-"m.	c #FDE54E",
-"n.	c #FDE74F",
-"o.	c #FDE850",
-"p.	c #FDEA50",
-"q.	c #FCEB51",
-"r.	c #FCED51",
-"s.	c #FCEF52",
-"t.	c #FCF053",
-"u.	c #FBF254",
-"v.	c #FBF454",
-"w.	c #FBF555",
-"x.	c #FBF554",
-"y.	c #FBF453",
-"z.	c #FCF04D",
-"A.	c #FEE24D",
-"B.	c #FDE34E",
-"C.	c #FDE54F",
-"D.	c #FCEA51",
-"E.	c #FCEC52",
-"F.	c #FCEE53",
-"G.	c #FCEF54",
-"H.	c #FCF154",
-"I.	c #FBF355",
-"J.	c #FBF456",
-"K.	c #FBF657",
-"L.	c #FBF656",
-"M.	c #FBF556",
-"N.	c #FDE94C",
-"O.	c #FFDC4A",
-"P.	c #FEE44F",
-"Q.	c #FDE751",
-"R.	c #FEE14D",
-"S.	c #FAF559",
-"T.	c #FAF75A",
-"U.	c #FAF759",
-"V.	c #FAF659",
-"W.	c #FBF658",
-"X.	c #FBF557",
-"Y.	c #FBF455",
-"Z.	c #FDEC4C",
-"`.	c #FEEB41",
-" +	c #FFDE4B",
-".+	c #FEE24E",
-"++	c #FDE650",
-"@+	c #FDE752",
-"#+	c #FDE953",
-"$+	c #FCEB54",
-"%+	c #FCEC55",
-"&+	c #FCEE56",
-"*+	c #FBF058",
-"=+	c #FBF259",
-"-+	c #FBF45A",
-";+	c #FAF65A",
-">+	c #FAF75C",
-",+	c #FAF85C",
-"'+	c #FAF75B",
-")+	c #FDE550",
-"!+	c #FEDF4C",
-"~+	c #FCEE4D",
-"{+	c #FEE04D",
-"]+	c #FDE44F",
-"^+	c #FDE651",
-"/+	c #FCE954",
-"(+	c #FCEB55",
-"_+	c #FBED57",
-":+	c #FCEF57",
-"<+	c #FBF159",
-"[+	c #FBF25A",
-"}+	c #FBF45C",
-"|+	c #FAF65D",
-"1+	c #FAF85E",
-"2+	c #FAF95F",
-"3+	c #FAF95E",
-"4+	c #FAF85D",
-"5+	c #FDE851",
-"6+	c #FDE64B",
-"7+	c #FFDD4B",
-"8+	c #FDE450",
-"9+	c #FDE853",
-"0+	c #FCEB56",
-"a+	c #FBED58",
-"b+	c #FBEF59",
-"c+	c #FBF15B",
-"d+	c #FAF35C",
-"e+	c #FAF55D",
-"f+	c #FAF75F",
-"g+	c #F9F960",
-"h+	c #F9FA61",
-"i+	c #F9FA60",
-"j+	c #FCEB53",
-"k+	c #FEE24A",
-"l+	c #FAF35D",
-"m+	c #F9FB63",
-"n+	c #F9FB62",
-"o+	c #F9FA62",
-"p+	c #FCED55",
-"q+	c #FBF358",
-"r+	c #FEE344",
-"s+	c #FAF45D",
-"t+	c #FBF057",
-"u+	c #FBF156",
-"v+	c #FEE941",
-"w+	c #FAF55E",
-"x+	c #FCEE55",
-"y+	c #FCED4C",
-"z+	c #FEEB40",
-"A+	c #FAF65F",
-"B+	c #FAF95D",
-"C+	c #FAF85B",
-"D+	c #FCEB52",
-"E+	c #FCF34F",
-"F+	c #FDED4D",
-"G+	c #FCF14B",
-"H+	c #FDF048",
-"I+	c #FDEF46",
-"J+	c #FDEE44",
-"K+	c #FEED42",
-"L+	c #FEED41",
-"M+	c #FEEC40",
-"N+	c #FDE74B",
-"O+	c #FEE444",
-"P+	c #FDE750",
-"Q+	c #FDE652",
-"R+	c #FCEC53",
-"S+	c #FBF458",
-"T+	c #FEE64B",
-"U+	c #FFE245",
-"V+	c #FBF157",
-"W+	c #FBEF55",
-"X+	c #FDEB4D",
-"Y+	c #FEEA41",
-"Z+	c #FBF05A",
-"`+	c #FCEA52",
-" @	c #FFE146",
-".@	c #FEE04A",
-"+@	c #FEE842",
-"@@	c #FDEB4C",
-"#@	c #FEE643",
-"$@	c #FCE854",
-"%@	c #FCED54",
-"&@	c #FBF056",
-"*@	c #FCE952",
-"=@	c #F9F961",
-"-@	c #FEE34E",
-";@	c #FCF24D",
-">@	c #FFDC48",
-",@	c #FEE14E",
-"'@	c #FFE344",
-")@	c #FCE955",
-"!@	c #FEEA40",
-"~@	c #FBF25B",
-"{@	c #FBF258",
-"]@	c #FEEC3F",
-"^@	c #FFE145",
-"/@	c #F9F962",
-"(@	c #FEE841",
-"_@	c #FEE34F",
-":@	c #FFDE47",
-"<@	c #FCEC58",
-"[@	c #FCEF55",
-"}@	c #FEE543",
-"|@	c #FAF660",
-"1@	c #F9FB64",
-"2@	c #FAF960",
-"3@	c #FBF659",
-"4@	c #FCF352",
-"5@	c #FDF04B",
-"6@	c #FEED44",
-"7@	c #FDE753",
-"8@	c #FBF05B",
-"9@	c #FDED4C",
-"0@	c #FEE742",
-"a@	c #FCED59",
-"b@	c #FAF761",
-"c@	c #FAF658",
-"d@	c #FEE443",
-"e@	c #FDEC4B",
-"f@	c #FCEF4B",
-"g@	c #BCAF32",
-"h@	c #847B23",
-"i@	c #7D7421",
-"j@	c #A4992B",
-"k@	c #F2E240",
-"l@	c #DBD141",
-"m@	c #2A280C",
-"n@	c #23210A",
-"o@	c #040301",
-"p@	c #625C1D",
-"q@	c #F2E443",
-"r@	c #CABE38",
-"s@	c #C5B936",
-"t@	c #E9DB40",
-"u@	c #E3D53E",
-"v@	c #9B912A",
-"w@	c #988F29",
-"x@	c #7E7622",
-"y@	c #D8CB3B",
-"z@	c #494514",
-"A@	c #0E0D04",
-"B@	c #211E09",
-"C@	c #E7D83E",
-"D@	c #34310E",
-"E@	c #131105",
-"F@	c #5D5719",
-"G@	c #655E1B",
-"H@	c #1E1C08",
-"I@	c #191707",
-"J@	c #CDC036",
-"K@	c #FEE940",
-"L@	c #FDE94B",
-"M@	c #FAEF4A",
-"N@	c #D6CB3F",
-"O@	c #D7CC40",
-"P@	c #22210A",
-"Q@	c #484515",
-"R@	c #F3E546",
-"S@	c #EEE144",
-"T@	c #F8EB47",
-"U@	c #B7AC34",
-"V@	c #8F8729",
-"W@	c #99912C",
-"X@	c #DED23E",
-"Y@	c #DCCF3E",
-"Z@	c #4B4615",
-"`@	c #030301",
-" #	c #1C1A08",
-".#	c #1D1B08",
-"+#	c #010100",
-"@#	c #494414",
-"##	c #E0D23E",
-"$#	c #C1B535",
-"%#	c #67611C",
-"&#	c #3E3A11",
-"*#	c #000000",
-"=#	c #222009",
-"-#	c #A49A2D",
-";#	c #E4D73D",
-">#	c #827923",
-",#	c #CEC037",
-"'#	c #474213",
-")#	c #E9D93D",
-"!#	c #F3E340",
-"~#	c #312E0D",
-"{#	c #28250A",
-"]#	c #FEEB3F",
-"^#	c #FDE551",
-"/#	c #F9FC64",
-"(#	c #FBF251",
-"_#	c #E7DF4A",
-":#	c #D7D045",
-"<#	c #C4BD3F",
-"[#	c #CFC742",
-"}#	c #544F19",
-"|#	c #383511",
-"1#	c #CDC23B",
-"2#	c #706A20",
-"3#	c #6D671F",
-"4#	c #524E18",
-"5#	c #D7CB3E",
-"6#	c #444114",
-"7#	c #3A3710",
-"8#	c #B5AB33",
-"9#	c #27250B",
-"0#	c #2D2B0D",
-"a#	c #5F5A1B",
-"b#	c #322F0E",
-"c#	c #070702",
-"d#	c #B6AC33",
-"e#	c #E2D63F",
-"f#	c #161506",
-"g#	c #403C12",
-"h#	c #DBCE3D",
-"i#	c #D1C53A",
-"j#	c #28260B",
-"k#	c #211F09",
-"l#	c #F0E242",
-"m#	c #CDC138",
-"n#	c #575218",
-"o#	c #F5E642",
-"p#	c #585218",
-"q#	c #A79C2D",
-"r#	c #E1D23C",
-"s#	c #948A28",
-"t#	c #FDEC43",
-"u#	c #EADA3E",
-"v#	c #DACB39",
-"w#	c #71691E",
-"x#	c #D5C738",
-"y#	c #FCED58",
-"z#	c #EFE950",
-"A#	c #EFE850",
-"B#	c #E7E04C",
-"C#	c #D5CF46",
-"D#	c #BBB63E",
-"E#	c #9E9A34",
-"F#	c #918D30",
-"G#	c #8F8B2F",
-"H#	c #ABA638",
-"I#	c #E6E04B",
-"J#	c #4B4818",
-"K#	c #2B290E",
-"L#	c #1B1A09",
-"M#	c #0B0B04",
-"N#	c #171607",
-"O#	c #F5EB4B",
-"P#	c #DBD043",
-"Q#	c #E2C542",
-"R#	c #F8E249",
-"S#	c #847F28",
-"T#	c #28260C",
-"U#	c #060602",
-"V#	c #706B21",
-"W#	c #5D591C",
-"X#	c #D1C73C",
-"Y#	c #928B2A",
-"Z#	c #5D581B",
-"`#	c #201E09",
-" $	c #A99F31",
-".$	c #F8EA48",
-"+$	c #E4D841",
-"@$	c #302D0E",
-"#$	c #4D4816",
-"$$	c #FBED47",
-"%$	c #36330F",
-"&$	c #2F2C0D",
-"*$	c #69631E",
-"=$	c #100F05",
-"-$	c #EEE042",
-";$	c #CFC339",
-">$	c #8F8627",
-",$	c #E5D83F",
-"'$	c #7D7622",
-")$	c #F1E341",
-"!$	c #38340F",
-"~$	c #4B4614",
-"{$	c #EFDF40",
-"]$	c #151306",
-"^$	c #0C0B03",
-"/$	c #33300D",
-"($	c #DFD03B",
-"_$	c #FBF558",
-":$	c #A39F37",
-"<$	c #6B6924",
-"[$	c #706D26",
-"}$	c #696624",
-"|$	c #59561E",
-"1$	c #3C3A14",
-"2$	c #161507",
-"3$	c #86832D",
-"4$	c #8D892F",
-"5$	c #28270D",
-"6$	c #514E1B",
-"7$	c #5A571E",
-"8$	c #474517",
-"9$	c #020201",
-"0$	c #626020",
-"a$	c #F4ED50",
-"b$	c #0A0A03",
-"c$	c #514E1A",
-"d$	c #9A9532",
-"e$	c #AFA938",
-"f$	c #BFB83D",
-"g$	c #CBC341",
-"h$	c #343211",
-"i$	c #111005",
-"j$	c #CAC341",
-"k$	c #E9E049",
-"l$	c #AAA335",
-"m$	c #8E882C",
-"n$	c #938D2E",
-"o$	c #CDC53F",
-"p$	c #D7CE42",
-"q$	c #64601F",
-"r$	c #605C1E",
-"s$	c #423F14",
-"t$	c #0B0A03",
-"u$	c #1E1A09",
-"v$	c #BEA336",
-"w$	c #524717",
-"x$	c #888229",
-"y$	c #D3CA3F",
-"z$	c #CDC33D",
-"A$	c #635E1D",
-"B$	c #040401",
-"C$	c #181707",
-"D$	c #645F1D",
-"E$	c #98902B",
-"F$	c #ABA231",
-"G$	c #807924",
-"H$	c #F4E644",
-"I$	c #2C2A0C",
-"J$	c #4C4815",
-"K$	c #555017",
-"L$	c #F5E743",
-"M$	c #807923",
-"N$	c #C5B835",
-"O$	c #898025",
-"P$	c #DCCE3A",
-"Q$	c #ECDC3E",
-"R$	c #A59A2C",
-"S$	c #EEDE3F",
-"T$	c #FDE951",
-"U$	c #8A872F",
-"V$	c #646222",
-"W$	c #676423",
-"X$	c #A09C35",
-"Y$	c #B0AC3B",
-"Z$	c #E2DC4C",
-"`$	c #F1EA51",
-" %	c #D4CE47",
-".%	c #F0E950",
-"+%	c #424016",
-"@%	c #E9E34D",
-"#%	c #F9F252",
-"$%	c #989332",
-"%%	c #4A4818",
-"&%	c #ADA738",
-"*%	c #F8EF50",
-"=%	c #524F1A",
-"-%	c #131206",
-";%	c #CBC441",
-">%	c #827C29",
-",%	c #444115",
-"'%	c #666220",
-")%	c #3E3C13",
-"!%	c #99932F",
-"~%	c #E2D946",
-"{%	c #9D9731",
-"]%	c #7B7626",
-"^%	c #201F0A",
-"/%	c #757024",
-"(%	c #F0E649",
-"_%	c #E5DB46",
-":%	c #332D0F",
-"<%	c #181507",
-"[%	c #FCD848",
-"}%	c #BCA236",
-"|%	c #9B8A2D",
-"1%	c #423E13",
-"2%	c #080802",
-"3%	c #E5D942",
-"4%	c #948C2B",
-"5%	c #BCB135",
-"6%	c #C1B637",
-"7%	c #A0972D",
-"8%	c #28250B",
-"9%	c #504B16",
-"0%	c #756E20",
-"a%	c #F2E241",
-"b%	c #6D661D",
-"c%	c #CFC136",
-"d%	c #C9BC35",
-"e%	c #22220C",
-"f%	c #1E1D0A",
-"g%	c #6D6A24",
-"h%	c #E7E14D",
-"i%	c #797628",
-"j%	c #B6B13C",
-"k%	c #2F2D0F",
-"l%	c #ABA438",
-"m%	c #F9F050",
-"n%	c #56531C",
-"o%	c #141306",
-"p%	c #CDC642",
-"q%	c #CEC540",
-"r%	c #6F6B23",
-"s%	c #4C4917",
-"t%	c #2A280D",
-"u%	c #F2E94B",
-"v%	c #2D2B0E",
-"w%	c #ADA134",
-"x%	c #C6AA39",
-"y%	c #776622",
-"z%	c #F9D647",
-"A%	c #8E862A",
-"B%	c #F5E949",
-"C%	c #F5E847",
-"D%	c #948B2B",
-"E%	c #CCC13A",
-"F%	c #B9AF35",
-"G%	c #B4AA32",
-"H%	c #CEC33A",
-"I%	c #524D17",
-"J%	c #1D1C08",
-"K%	c #FCED46",
-"L%	c #EFE142",
-"M%	c #080702",
-"N%	c #736C1F",
-"O%	c #181606",
-"P%	c #635E1B",
-"Q%	c #726A1F",
-"R%	c #A89C2C",
-"S%	c #E0D13B",
-"T%	c #302D0D",
-"U%	c #413D11",
-"V%	c #FCEE59",
-"W%	c #FDE64F",
-"X%	c #343312",
-"Y%	c #0E0E05",
-"Z%	c #7D7A29",
-"`%	c #D8D247",
-" &	c #DDD748",
-".&	c #676422",
-"+&	c #5C581D",
-"@&	c #0F0F05",
-"#&	c #21200B",
-"$&	c #BEB73D",
-"%&	c #E1D847",
-"&&	c #484516",
-"*&	c #E3DA47",
-"=&	c #2C2A0E",
-"-&	c #0A0903",
-";&	c #686320",
-">&	c #D7CD42",
-",&	c #AA9231",
-"'&	c #64561D",
-")&	c #A49B31",
-"!&	c #E6DA44",
-"~&	c #857E26",
-"{&	c #DCD03F",
-"]&	c #A9A030",
-"^&	c #C3B837",
-"/&	c #BEB335",
-"(&	c #BAB034",
-"_&	c #837C24",
-":&	c #F8E945",
-"<&	c #5B5519",
-"[&	c #E6D93F",
-"}&	c #0D0D04",
-"|&	c #A39A2D",
-"1&	c #9A9129",
-"2&	c #FCEB43",
-"3&	c #FAE943",
-"4&	c #6A631C",
-"5&	c #1A1907",
-"6&	c #25220A",
-"7&	c #504A15",
-"8&	c #EDDD3F",
-"9&	c #FAF45E",
-"0&	c #FCF256",
-"a&	c #444217",
-"b&	c #F8F253",
-"c&	c #C8C242",
-"d&	c #0F0E05",
-"e&	c #3F3D15",
-"f&	c #85802B",
-"g&	c #B5AE3A",
-"h&	c #3C3913",
-"i&	c #C5BE3E",
-"j&	c #FAF04E",
-"k&	c #BEB63B",
-"l&	c #807B28",
-"m&	c #413E14",
-"n&	c #050502",
-"o&	c #191808",
-"p&	c #F5EC4C",
-"q&	c #716C22",
-"r&	c #E8DE47",
-"s&	c #9A852C",
-"t&	c #7D6B24",
-"u&	c #E8C742",
-"v&	c #A79E31",
-"w&	c #746E21",
-"x&	c #E8DB42",
-"y&	c #928A2A",
-"z&	c #F5E746",
-"A&	c #B3AA32",
-"B&	c #6F691F",
-"C&	c #DED13E",
-"D&	c #8D8528",
-"E&	c #6A641D",
-"F&	c #615B1B",
-"G&	c #161406",
-"H&	c #B7AC33",
-"I&	c #595418",
-"J&	c #5C5719",
-"K&	c #F7E742",
-"L&	c #EADB3E",
-"M&	c #BDB032",
-"N&	c #BFB232",
-"O&	c #E8D83D",
-"P&	c #FFE244",
-"Q&	c #F9F963",
-"R&	c #54521C",
-"S&	c #EAE44E",
-"T&	c #9D9834",
-"U&	c #B8B33D",
-"V&	c #1D1D0A",
-"W&	c #333211",
-"X&	c #C6BF40",
-"Y&	c #E1D948",
-"Z&	c #E9E14B",
-"`&	c #656220",
-" *	c #E5DC48",
-".*	c #151406",
-"+*	c #625E1F",
-"@*	c #87822A",
-"#*	c #D1C942",
-"$*	c #AEA736",
-"%*	c #E5DC47",
-"&*	c #C0B83B",
-"**	c #C9C13E",
-"=*	c #27250C",
-"-*	c #65601F",
-";*	c #F8ED4C",
-">*	c #897C28",
-",*	c #CAAD3A",
-"'*	c #786722",
-")*	c #FDEF4B",
-"!*	c #6A6520",
-"~*	c #C0B639",
-"{*	c #BFB637",
-"]*	c #A49B2F",
-"^*	c #2B280C",
-"/*	c #787223",
-"(*	c #E0D441",
-"_*	c #817A25",
-":*	c #3E3A12",
-"<*	c #C0B537",
-"[*	c #464314",
-"}*	c #131205",
-"|*	c #454113",
-"1*	c #403D12",
-"2*	c #9E952C",
-"3*	c #DDD03D",
-"4*	c #908828",
-"5*	c #726B1F",
-"6*	c #7B7422",
-"7*	c #AAA02F",
-"8*	c #F3E443",
-"9*	c #F9FC65",
-"0*	c #FBF357",
-"a*	c #646122",
-"b*	c #DAD549",
-"c*	c #ADA839",
-"d*	c #A8A338",
-"e*	c #FAF352",
-"f*	c #0B0A04",
-"g*	c #D5CD45",
-"h*	c #807B29",
-"i*	c #504D19",
-"j*	c #EAE149",
-"k*	c #A59F33",
-"l*	c #D6CD42",
-"m*	c #6D6922",
-"n*	c #706C23",
-"o*	c #363411",
-"p*	c #54501A",
-"q*	c #FBF04D",
-"r*	c #67621F",
-"s*	c #FBDB48",
-"t*	c #F8D547",
-"u*	c #716120",
-"v*	c #60521B",
-"w*	c #AB9331",
-"x*	c #A89731",
-"y*	c #111105",
-"z*	c #454114",
-"A*	c #A9A132",
-"B*	c #FBEE48",
-"C*	c #5C571A",
-"D*	c #746E22",
-"E*	c #827B25",
-"F*	c #7D7624",
-"G*	c #E1D541",
-"H*	c #BDB236",
-"I*	c #D4C83C",
-"J*	c #E0D340",
-"K*	c #FEE350",
-"L*	c #747127",
-"M*	c #CAC544",
-"N*	c #BCB73E",
-"O*	c #989432",
-"P*	c #C3BE40",
-"Q*	c #827E2A",
-"R*	c #ABA538",
-"S*	c #7B7628",
-"T*	c #F5EC4F",
-"U*	c #D5CE45",
-"V*	c #787426",
-"W*	c #ECE34A",
-"X*	c #D9D044",
-"Y*	c #26250C",
-"Z*	c #B5AE38",
-"`*	c #635F1F",
-" =	c #BDB63B",
-".=	c #9C9630",
-"+=	c #6D6821",
-"@=	c #878129",
-"#=	c #4F4B18",
-"$=	c #29270C",
-"%=	c #4C4116",
-"&=	c #AC9431",
-"*=	c #574A19",
-"==	c #362E0F",
-"-=	c #453B14",
-";=	c #857C27",
-">=	c #E1D543",
-",=	c #938C2C",
-"'=	c #B6AD36",
-")=	c #B5AB35",
-"!=	c #E5D943",
-"~=	c #FDE955",
-"{=	c #FAF558",
-"]=	c #83802C",
-"^=	c #BAB63E",
-"/=	c #CCC744",
-"(=	c #88852D",
-"_=	c #F2EB4F",
-":=	c #353411",
-"<=	c #121206",
-"[=	c #E8E14C",
-"}=	c #E5DD4B",
-"|=	c #0C0C04",
-"1=	c #353311",
-"2=	c #DED647",
-"3=	c #C7C040",
-"4=	c #151407",
-"5=	c #E3DB48",
-"6=	c #DDD445",
-"7=	c #181708",
-"8=	c #4E4B19",
-"9=	c #373511",
-"0=	c #858029",
-"a=	c #4F4C19",
-"b=	c #BDB53A",
-"c=	c #5F5B1D",
-"d=	c #7F7A27",
-"e=	c #8E882B",
-"f=	c #8F882C",
-"g=	c #AFA735",
-"h=	c #C5BD3C",
-"i=	c #D5CC41",
-"j=	c #EEE448",
-"k=	c #FBF04C",
-"l=	c #FFDF46",
-"m=	c #FBF356",
-"n=	c #938F32",
-"o=	c #A9A539",
-"p=	c #CBC543",
-"q=	c #55531C",
-"r=	c #F2EB50",
-"s=	c #F1EA50",
-"t=	c #D7D147",
-"u=	c #959131",
-"v=	c #25240C",
-"w=	c #BFBA3E",
-"x=	c #BEB83E",
-"y=	c #1D1C09",
-"z=	c #333110",
-"A=	c #413F15",
-"B=	c #494617",
-"C=	c #D8D045",
-"D=	c #ECE24A",
-"E=	c #A6A034",
-"F=	c #928D2E",
-"G=	c #A9A235",
-"H=	c #E8DF49",
-"I=	c #FBF14E",
-"J=	c #F8EF4D",
-"K=	c #FEE94A",
-"L=	c #FBF35E",
-"M=	c #FEE54E",
-"N=	c #BCB840",
-"O=	c #BCB740",
-"P=	c #4B4A1A",
-"Q=	c #353412",
-"R=	c #7D792A",
-"S=	c #5B581E",
-"T=	c #E4DD4C",
-"U=	c #686623",
-"V=	c #3E3C15",
-"W=	c #181808",
-"X=	c #24230C",
-"Y=	c #747126",
-"Z=	c #E5DE4B",
-"`=	c #F8EF51",
-" -	c #979231",
-".-	c #B1AA39",
-"+-	c #FAF55F",
-"@-	c #FBF055",
-"#-	c #FCF054",
-"$-	c #EAE44F",
-"%-	c #171608",
-"&-	c #312F10",
-"*-	c #474518",
-"=-	c #5D5B1F",
-"--	c #696623",
-";-	c #6E6A25",
-">-	c #6F6C25",
-",-	c #E9E34E",
-"'-	c #AFAA3B",
-")-	c #9A9633",
-"!-	c #BAB53E",
-"~-	c #DFD94A",
-"{-	c #E8E14D",
-"]-	c #E9E24D",
-"^-	c #FEE64A",
-"/-	c #FBEA42",
-"(-	c #CEC036",
-"_-	c #E7D83D",
-":-	c #FEE741",
-"<-	c #FDEE4B",
-"[-	c #ACA22F",
-"}-	c #797221",
-"|-	c #5E591A",
-"1-	c #29260B",
-"2-	c #26230A",
-"3-	c #433F12",
-"4-	c #67601C",
-"5-	c #9E932A",
-"6-	c #EEDE40",
-"7-	c #514C15",
-"8-	c #090802",
-"9-	c #FDEB52",
-"0-	c #FAEB45",
-"a-	c #4C4714",
-"b-	c #D4C639",
-"c-	c #201E08",
-"d-	c #A79C2C",
-"e-	c #FAF861",
-"f-	c #FBF457",
-"g-	c #FAED49",
-"h-	c #DED341",
-"i-	c #E4D843",
-"j-	c #968D29",
-"k-	c #020100",
-"l-	c #817923",
-"m-	c #2D2A0C",
-"n-	c #A0962A",
-"o-	c #FAF862",
-"p-	c #FBF559",
-"q-	c #A79430",
-"r-	c #32300F",
-"s-	c #E0D542",
-"t-	c #F7E844",
-"u-	c #4A4514",
-"v-	c #1F1D08",
-"w-	c #746D20",
-"x-	c #ADA32F",
-"y-	c #CABE37",
-"z-	c #EADC40",
-"A-	c #F1E342",
-"B-	c #E9DB3F",
-"C-	c #C9BD36",
-"D-	c #968C28",
-"E-	c #3F3B11",
-"F-	c #998F28",
-"G-	c #FCEE54",
-"H-	c #FCF255",
-"I-	c #F7ED4C",
-"J-	c #DFD645",
-"K-	c #CAC23F",
-"L-	c #B6AF38",
-"M-	c #A29C32",
-"N-	c #7A7425",
-"O-	c #66621F",
-"P-	c #797325",
-"Q-	c #D6CD41",
-"R-	c #FCEE4B",
-"S-	c #D9BB3E",
-"T-	c #060502",
-"U-	c #363310",
-"V-	c #E8DA41",
-"W-	c #1F1D09",
-"X-	c #ABA12F",
-"Y-	c #D3C538",
-"Z-	c #2E2B0C",
-"`-	c #938927",
-" ;	c #F9FA63",
-".;	c #ECE34C",
-"+;	c #D9D246",
-"@;	c #C3BC3E",
-"#;	c #B7B13A",
-"$;	c #ACA637",
-"%;	c #A09A33",
-"&;	c #958F2F",
-"*;	c #89842B",
-"=;	c #7D7827",
-"-;	c #736E24",
-";;	c #615D1F",
-">;	c #1F1E0A",
-",;	c #61531C",
-"';	c #A0982F",
-");	c #26240B",
-"!;	c #544F17",
-"~;	c #F6E844",
-"{;	c #F8E842",
-"];	c #403C11",
-"^;	c #8C8325",
-"/;	c #F9FB65",
-"(;	c #FCF257",
-"_;	c #D5CD44",
-":;	c #F5D346",
-"<;	c #0D0B04",
-"[;	c #FAEE49",
-"};	c #68621D",
-"|;	c #5A5419",
-"1;	c #F6E542",
-"2;	c #1C1A07",
-"3;	c #FBF15C",
-"4;	c #050401",
-"5;	c #23210B",
-"6;	c #C4BC3C",
-"7;	c #A99130",
-"8;	c #24200A",
-"9;	c #A69E31",
-"0;	c #CDC23A",
-"a;	c #9B9029",
-"b;	c #716A1E",
-"c;	c #444216",
-"d;	c #343311",
-"e;	c #656120",
-"f;	c #2B2A0E",
-"g;	c #C2BA3D",
-"h;	c #F8EE4E",
-"i;	c #F7EE4D",
-"j;	c #B0A936",
-"k;	c #D5CB41",
-"l;	c #504417",
-"m;	c #796823",
-"n;	c #877E27",
-"o;	c #FCEF4A",
-"p;	c #464214",
-"q;	c #CBBF38",
-"r;	c #575117",
-"s;	c #FDEA52",
-"t;	c #666221",
-"u;	c #161607",
-"v;	c #ABA537",
-"w;	c #A09932",
-"x;	c #A59E33",
-"y;	c #E1D745",
-"z;	c #EFCD44",
-"A;	c #070602",
-"B;	c #CCB03B",
-"C;	c #ECD244",
-"D;	c #AEA533",
-"E;	c #DDD03E",
-"F;	c #35320E",
-"G;	c #FEE24F",
-"H;	c #959030",
-"I;	c #AEA738",
-"J;	c #9E9832",
-"K;	c #B7B039",
-"L;	c #F3E84B",
-"M;	c #D9CF42",
-"N;	c #9C872D",
-"O;	c #211D0A",
-"P;	c #FDEE4A",
-"Q;	c #66611E",
-"R;	c #34310F",
-"S;	c #8B8327",
-"T;	c #9C932C",
-"U;	c #171606",
-"V;	c #F9F85F",
-"W;	c #DDDC54",
-"X;	c #ABAB40",
-"Y;	c #B6B545",
-"Z;	c #F6F55D",
-"`;	c #B9B23B",
-" >	c #F3EA4E",
-".>	c #BCB53C",
-"+>	c #B0A937",
-"@>	c #BFB73A",
-"#>	c #433C14",
-"$>	c #736D22",
-"%>	c #D4C93E",
-"&>	c #B6AD35",
-"*>	c #4B4715",
-"=>	c #E6D841",
-"->	c #918727",
-";>	c #37330E",
-">>	c #EBEC5B",
-",>	c #DDDE56",
-"'>	c #CDCE50",
-")>	c #BEBE49",
-"!>	c #AFAE43",
-"~>	c #9F9E3D",
-"{>	c #8F8E37",
-"]>	c #7F7F31",
-"^>	c #6F6F2B",
-"/>	c #605F25",
-"(>	c #50501E",
-"_>	c #44441A",
-":>	c #2C2C11",
-"<>	c #0E0E06",
-"[>	c #3B3B16",
-"}>	c #F8F65D",
-"|>	c #CDC541",
-"1>	c #A09A32",
-"2>	c #22200A",
-"3>	c #E4D944",
-"4>	c #C6BC3B",
-"5>	c #464315",
-"6>	c #3C3911",
-"7>	c #181607",
-"8>	c #FCEC44",
-"9>	c #AB9F2D",
-"0>	c #9F952A",
-"a>	c #EBDB3E",
-"b>	c #FBEE59",
-"c>	c #F1F260",
-"d>	c #848534",
-"e>	c #50501F",
-"f>	c #42431A",
-"g>	c #414119",
-"h>	c #3E3F19",
-"i>	c #383816",
-"j>	c #303013",
-"k>	c #292910",
-"l>	c #20200C",
-"m>	c #131307",
-"n>	c #C8C74B",
-"o>	c #D3CB44",
-"p>	c #F2E94E",
-"q>	c #DDD546",
-"r>	c #918B2D",
-"s>	c #746F23",
-"t>	c #8F882A",
-"u>	c #BEB437",
-"v>	c #F6E945",
-"w>	c #35320F",
-"x>	c #EDDD3E",
-"y>	c #FDEC42",
-"z>	c #838434",
-"A>	c #BEBC47",
-"B>	c #FEE14C",
-"C>	c #FDEB51",
-"D>	c #F1E94E",
-"E>	c #C4BD40",
-"F>	c #999432",
-"G>	c #706C25",
-"H>	c #757126",
-"I>	c #B4AD39",
-"J>	c #CFC843",
-"K>	c #EDE44B",
-"L>	c #817C28",
-"M>	c #363410",
-"N>	c #6F6921",
-"O>	c #444013",
-"P>	c #E7DA41",
-"Q>	c #F3E442",
-"R>	c #CDBF37",
-"S>	c #C2B534",
-"T>	c #C0B333",
-"U>	c #BEB133",
-"V>	c #B9AD32",
-"W>	c #B2A630",
-"X>	c #AA9F2E",
-"Y>	c #A3982B",
-"Z>	c #9C9229",
-"`>	c #8A8125",
-" ,	c #756D1F",
-".,	c #585217",
-"+,	c #36330E",
-"@,	c #1D1B07",
-"#,	c #D9C938",
-"$,	c #8F9039",
-"%,	c #24240E",
-"&,	c #3C3C17",
-"*,	c #4E4E1E",
-"=,	c #5E5E24",
-"-,	c #6E6D2A",
-";,	c #7D7D30",
-">,	c #8D8D36",
-",,	c #9D9C3C",
-"',	c #B0AF43",
-"),	c #BABA47",
-"!,	c #B9B846",
-"~,	c #A1A13D",
-"{,	c #5F5F24",
-"],	c #C9C74C",
-"^,	c #FEE44E",
-"/,	c #F1EB53",
-"(,	c #F9F355",
-"_,	c #DED84A",
-":,	c #777428",
-"<,	c #726F26",
-"[,	c #E3DC4C",
-"},	c #969232",
-"|,	c #151507",
-"1,	c #121106",
-"2,	c #2A290E",
-"3,	c #393813",
-"4,	c #3B3A14",
-"5,	c #2D2C0F",
-"6,	c #0E0D05",
-"7,	c #21200A",
-"8,	c #A39D34",
-"9,	c #FBF150",
-"0,	c #030201",
-"a,	c #716C23",
-"b,	c #22210B",
-"c,	c #3D3A13",
-"d,	c #DACF41",
-"e,	c #C2B839",
-"f,	c #948D2B",
-"g,	c #C6BB39",
-"h,	c #E0D43F",
-"i,	c #484314",
-"j,	c #A0972C",
-"k,	c #9A8F28",
-"l,	c #FBF25C",
-"m,	c #F7F862",
-"n,	c #94953A",
-"o,	c #6F6F2C",
-"p,	c #9A9A3C",
-"q,	c #CACB50",
-"r,	c #E3E459",
-"s,	c #CBCC50",
-"t,	c #4D4D1E",
-"u,	c #1A1A0A",
-"v,	c #D7D854",
-"w,	c #78782E",
-"x,	c #D4D350",
-"y,	c #F0CE45",
-"z,	c #867729",
-"A,	c #6D6824",
-"B,	c #656323",
-"C,	c #696724",
-"D,	c #7F7C2C",
-"E,	c #B0AC3D",
-"F,	c #F2EC54",
-"G,	c #B1AD3D",
-"H,	c #050402",
-"I,	c #333212",
-"J,	c #F8F255",
-"K,	c #C7C244",
-"L,	c #131306",
-"M,	c #25240D",
-"N,	c #2F2E10",
-"O,	c #2B2A0F",
-"P,	c #656222",
-"Q,	c #323111",
-"R,	c #817D2A",
-"S,	c #615D1E",
-"T,	c #A39C32",
-"U,	c #98912E",
-"V,	c #837C27",
-"W,	c #FBEE4A",
-"X,	c #F2E647",
-"Y,	c #4B4716",
-"Z,	c #3D3A11",
-"`,	c #524D16",
-" '	c #322F0D",
-".'	c #E6D63C",
-"+'	c #FDE854",
-"@'	c #EDEE5D",
-"#'	c #090903",
-"$'	c #686828",
-"%'	c #DBDA53",
-"&'	c #D3D24F",
-"*'	c #BAAF3D",
-"='	c #646123",
-"-'	c #646223",
-";'	c #DDD74C",
-">'	c #3F3E16",
-",'	c #827E2B",
-"''	c #938F30",
-")'	c #313010",
-"!'	c #464417",
-"~'	c #C2BB3F",
-"{'	c #C1BA3F",
-"]'	c #CDC543",
-"^'	c #E1D949",
-"/'	c #A49E35",
-"('	c #514E19",
-"_'	c #EFE449",
-":'	c #EADF47",
-"<'	c #BDB234",
-"['	c #605A1A",
-"}'	c #7C7321",
-"|'	c #7F7722",
-"1'	c #464113",
-"2'	c #423D11",
-"3'	c #FEDE4C",
-"4'	c #2F2F12",
-"5'	c #74752D",
-"6'	c #DEDD55",
-"7'	c #565521",
-"8'	c #636225",
-"9'	c #F3F25C",
-"0'	c #BEBD48",
-"a'	c #C2C047",
-"b'	c #868531",
-"c'	c #55551F",
-"d'	c #333313",
-"e'	c #1B1B0A",
-"f'	c #0F0F06",
-"g'	c #121207",
-"h'	c #27260E",
-"i'	c #4A491B",
-"j'	c #74722A",
-"k'	c #CFCC4B",
-"l'	c #EFEA55",
-"m'	c #494719",
-"n'	c #E6E04F",
-"o'	c #A39F38",
-"p'	c #141307",
-"q'	c #4C4A1A",
-"r'	c #C2BC41",
-"s'	c #BDB73F",
-"t'	c #FAF354",
-"u'	c #ACA739",
-"v'	c #F5EC50",
-"w'	c #9C9732",
-"x'	c #86812B",
-"y'	c #312F0F",
-"z'	c #CEC53E",
-"A'	c #BDB338",
-"B'	c #DACE40",
-"C'	c #534F18",
-"D'	c #FAEB46",
-"E'	c #5A5418",
-"F'	c #C5B834",
-"G'	c #404119",
-"H'	c #696929",
-"I'	c #5E5D24",
-"J'	c #99993A",
-"K'	c #9F9E3C",
-"L'	c #F8F65C",
-"M'	c #898732",
-"N'	c #111106",
-"O'	c #646324",
-"P'	c #F6F359",
-"Q'	c #F5F057",
-"R'	c #302F11",
-"S'	c #070703",
-"T'	c #5D5B21",
-"U'	c #9D9937",
-"V'	c #C2BF44",
-"W'	c #D2CE49",
-"X'	c #C9C546",
-"Y'	c #ACA73B",
-"Z'	c #666423",
-"`'	c #E9E350",
-" )	c #DCD74B",
-".)	c #928E30",
-"+)	c #938E30",
-"@)	c #413E15",
-"#)	c #767124",
-"$)	c #E3D743",
-"%)	c #EFE347",
-"&)	c #DDD242",
-"*)	c #CDC33C",
-"=)	c #BDB437",
-"-)	c #ADA433",
-";)	c #9D952E",
-">)	c #8A8329",
-",)	c #67621E",
-"')	c #D4C83D",
-"))	c #3B3811",
-"!)	c #D5C83C",
-"~)	c #A89D2D",
-"{)	c #595A23",
-"])	c #545420",
-"^)	c #656526",
-"/)	c #7B7A2E",
-"()	c #CDCB4C",
-"_)	c #1C1C0A",
-":)	c #0D0D05",
-"<)	c #605F23",
-"[)	c #737129",
-"})	c #53511D",
-"|)	c #EDE853",
-"1)	c #DDD84D",
-"2)	c #2A290F",
-"3)	c #E7E14F",
-"4)	c #2C2B0F",
-"5)	c #403E15",
-"6)	c #E7DF4B",
-"7)	c #514D1A",
-"8)	c #1F1E09",
-"9)	c #5B561A",
-"0)	c #978E2A",
-"a)	c #B5A930",
-"b)	c #F2E140",
-"c)	c #606025",
-"d)	c #494A1D",
-"e)	c #6D6D2A",
-"f)	c #595922",
-"g)	c #141407",
-"h)	c #555420",
-"i)	c #D0CF4D",
-"j)	c #2A2A10",
-"k)	c #979637",
-"l)	c #E1E053",
-"m)	c #CECC4B",
-"n)	c #504F1D",
-"o)	c #C5C347",
-"p)	c #F8F358",
-"q)	c #100F06",
-"r)	c #F7F256",
-"s)	c #D6D14A",
-"t)	c #E0DA4D",
-"u)	c #F9F354",
-"v)	c #B2AD3C",
-"w)	c #E5DE4C",
-"x)	c #474417",
-"y)	c #605D1F",
-"z)	c #C2B93A",
-"A)	c #DACE3F",
-"B)	c #B2A832",
-"C)	c #4A4615",
-"D)	c #AA9E2D",
-"E)	c #E7D73D",
-"F)	c #FBEE5A",
-"G)	c #70702B",
-"H)	c #3A3A17",
-"I)	c #858433",
-"J)	c #5C5C23",
-"K)	c #151508",
-"L)	c #383715",
-"M)	c #414118",
-"N)	c #6B6A27",
-"O)	c #F8F65B",
-"P)	c #5F5E23",
-"Q)	c #666525",
-"R)	c #D9D44D",
-"S)	c #7C792B",
-"T)	c #383613",
-"U)	c #D2CD48",
-"V)	c #A5A038",
-"W)	c #383713",
-"X)	c #949031",
-"Y)	c #9E9833",
-"Z)	c #706C24",
-"`)	c #FBF14F",
-" !	c #25230B",
-".!	c #343210",
-"+!	c #545019",
-"@!	c #847D27",
-"#!	c #A49C30",
-"$!	c #B3AA34",
-"%!	c #716B21",
-"&!	c #F5E745",
-"*!	c #E1D43E",
-"=!	c #7F8032",
-"-!	c #7B7B2F",
-";!	c #666526",
-">!	c #ECEA58",
-",!	c #78772C",
-"'!	c #DAD84F",
-")!	c #26260E",
-"!!	c #D5D14C",
-"~!	c #7A782B",
-"{!	c #54521D",
-"]!	c #C3BE43",
-"^!	c #F9F254",
-"/!	c #29280E",
-"(!	c #B9B43E",
-"_!	c #080803",
-":!	c #EDE54D",
-"<!	c #EEE44A",
-"[!	c #F8ED4B",
-"}!	c #E0D341",
-"|!	c #6C661E",
-"1!	c #645E1C",
-"2!	c #312D0D",
-"3!	c #B6AA30",
-"4!	c #FAF45F",
-"5!	c #8F9038",
-"6!	c #101006",
-"7!	c #F7F860",
-"8!	c #E4E358",
-"9!	c #23230D",
-"0!	c #F7F65D",
-"a!	c #A3A23D",
-"b!	c #9A9A3A",
-"c!	c #F2F05B",
-"d!	c #E2E054",
-"e!	c #A7A63D",
-"f!	c #F8F55A",
-"g!	c #F8F559",
-"h!	c #F3EE56",
-"i!	c #F1EC55",
-"j!	c #83802D",
-"k!	c #DFDA4C",
-"l!	c #A49F37",
-"m!	c #E5DF4C",
-"n!	c #908A2E",
-"o!	c #DED545",
-"p!	c #B6AE37",
-"q!	c #E8DC45",
-"r!	c #FDEB4A",
-"s!	c #FDEB49",
-"t!	c #D8CD3E",
-"u!	c #6B651F",
-"v!	c #C7BB37",
-"w!	c #B6AA31",
-"x!	c #9F9F3E",
-"y!	c #5E5E25",
-"z!	c #A7A841",
-"A!	c #A7A640",
-"B!	c #898835",
-"C!	c #73732C",
-"D!	c #49491C",
-"E!	c #5B5A22",
-"F!	c #F9F75C",
-"G!	c #171709",
-"H!	c #7E7D2E",
-"I!	c #A2A03B",
-"J!	c #E4E152",
-"K!	c #444218",
-"L!	c #9A9736",
-"M!	c #DED94E",
-"N!	c #F8F256",
-"O!	c #C6C144",
-"P!	c #E4DE4E",
-"Q!	c #BFBA40",
-"R!	c #A8A237",
-"S!	c #CEC641",
-"T!	c #5E591C",
-"U!	c #3C3912",
-"V!	c #FEE549",
-"W!	c #4D4916",
-"X!	c #E5D841",
-"Y!	c #7D7623",
-"Z!	c #DFD23E",
-"`!	c #E2D33D",
-" ~	c #191807",
-".~	c #68611B",
-"+~	c #F9FA64",
-"@~	c #AEAF44",
-"#~	c #4D4D1D",
-"$~	c #AAA83F",
-"%~	c #E1DF53",
-"&~	c #F9F65A",
-"*~	c #949236",
-"=~	c #D4D14C",
-"-~	c #C9C547",
-";~	c #24230D",
-">~	c #414017",
-",~	c #58551E",
-"'~	c #898630",
-")~	c #C8C345",
-"!~	c #FAF456",
-"~~	c #A39E36",
-"{~	c #454317",
-"]~	c #0D0C04",
-"^~	c #F3EA4F",
-"/~	c #B0A938",
-"(~	c #BEB63C",
-"_~	c #F4E949",
-":~	c #8B8429",
-"<~	c #FFE049",
-"[~	c #BDB337",
-"}~	c #736D21",
-"|~	c #FAEC46",
-"1~	c #1B1907",
-"2~	c #D2C53A",
-"3~	c #C4B734",
-"4~	c #39350F",
-"5~	c #FFE345",
-"6~	c #BEBF4A",
-"7~	c #181809",
-"8~	c #313113",
-"9~	c #424219",
-"0~	c #3D3C17",
-"a~	c #19190A",
-"b~	c #353414",
-"c~	c #E0DF53",
-"d~	c #AAA93F",
-"e~	c #B7B643",
-"f~	c #F4F25A",
-"g~	c #D4D14D",
-"h~	c #201F0C",
-"i~	c #C4C247",
-"j~	c #B0AD3F",
-"k~	c #726F27",
-"l~	c #EEE952",
-"m~	c #F8F153",
-"n~	c #27260D",
-"o~	c #C6C042",
-"p~	c #E6E04C",
-"q~	c #5A581E",
-"r~	c #C0B83D",
-"s~	c #AEA737",
-"t~	c #A9A233",
-"u~	c #D9CE40",
-"v~	c #2B290C",
-"w~	c #ECDE42",
-"x~	c #6B651E",
-"y~	c #FDEC44",
-"z~	c #70691E",
-"A~	c #FCEB42",
-"B~	c #F9FA65",
-"C~	c #CECF50",
-"D~	c #7D7E31",
-"E~	c #6D6C2A",
-"F~	c #161608",
-"G~	c #D1CF4D",
-"H~	c #8A8933",
-"I~	c #55541F",
-"J~	c #B4B241",
-"K~	c #E7E251",
-"L~	c #7D7A2C",
-"M~	c #22210C",
-"N~	c #201F0B",
-"O~	c #A19D36",
-"P~	c #4C4919",
-"Q~	c #B1AC3B",
-"R~	c #D0C842",
-"S~	c #FEE84A",
-"T~	c #645E1D",
-"U~	c #37340F",
-"V~	c #66601C",
-"W~	c #827A23",
-"X~	c #898125",
-"Y~	c #827A24",
-"Z~	c #69631D",
-"`~	c #E1D23B",
-" {	c #FEEB42",
-".{	c #F9FC63",
-"+{	c #DDDF56",
-"@{	c #C2C24B",
-"#{	c #FAFA60",
-"${	c #D9D953",
-"%{	c #EEEE5A",
-"&{	c #FAFA5F",
-"*{	c #F4F45C",
-"={	c #808030",
-"-{	c #5E5E23",
-";{	c #CDCC4D",
-">{	c #F6F55B",
-",{	c #A3A23C",
-"'{	c #585720",
-"){	c #636324",
-"!{	c #74732A",
-"~{	c #A5A33B",
-"{{	c #FBF759",
-"]{	c #FBF758",
-"^{	c #D3CE4A",
-"/{	c #A9A63B",
-"({	c #737128",
-"_{	c #605E21",
-":{	c #4E4C1B",
-"<{	c #413F16",
-"[{	c #313011",
-"}{	c #161508",
-"|{	c #434217",
-"1{	c #26250D",
-"2{	c #CBC644",
-"3{	c #434116",
-"4{	c #F6EF51",
-"5{	c #FCF452",
-"6{	c #FCF451",
-"7{	c #DFD747",
-"8{	c #8D872C",
-"9{	c #E3D944",
-"0{	c #4D4917",
-"a{	c #FDF14B",
-"b{	c #FEE649",
-"c{	c #EFE345",
-"d{	c #6F6920",
-"e{	c #4F4B16",
-"f{	c #3E3B12",
-"g{	c #66601D",
-"h{	c #EFE243",
-"i{	c #B8AC31",
-"j{	c #857C23",
-"k{	c #27250A",
-"l{	c #FAEA42",
-"m{	c #FEE744",
-"n{	c #EDEF5C",
-"o{	c #B5B647",
-"p{	c #CACA4D",
-"q{	c #74732C",
-"r{	c #27260F",
-"s{	c #F9F85C",
-"t{	c #8A8A33",
-"u{	c #4F4E1D",
-"v{	c #919035",
-"w{	c #E8E654",
-"x{	c #A6A43C",
-"y{	c #959336",
-"z{	c #E3E051",
-"A{	c #2F2E11",
-"B{	c #999636",
-"C{	c #E0C140",
-"D{	c #4F4A19",
-"E{	c #DAD54B",
-"F{	c #A09C36",
-"G{	c #52501B",
-"H{	c #646121",
-"I{	c #E4DC49",
-"J{	c #676320",
-"K{	c #F5EA4A",
-"L{	c #474415",
-"M{	c #1C1B08",
-"N{	c #CEC53D",
-"O{	c #F2E748",
-"P{	c #D7CD40",
-"Q{	c #AEA634",
-"R{	c #9C942E",
-"S{	c #E2C241",
-"T{	c #4A3F15",
-"U{	c #1B1708",
-"V{	c #201C09",
-"W{	c #99902B",
-"X{	c #E7D940",
-"Y{	c #020200",
-"Z{	c #454012",
-"`{	c #928927",
-" ]	c #F8E742",
-".]	c #B3A72F",
-"+]	c #040402",
-"@]	c #A5A640",
-"#]	c #B0B043",
-"$]	c #45451A",
-"%]	c #5D5D23",
-"&]	c #414018",
-"*]	c #81802F",
-"=]	c #C5C348",
-"-]	c #F6F45B",
-";]	c #B5B442",
-">]	c #858430",
-",]	c #474619",
-"']	c #8B8831",
-")]	c #393814",
-"!]	c #A9A53A",
-"~]	c #D1CB45",
-"{]	c #DCD345",
-"]]	c #FAF04D",
-"^]	c #F4EA4C",
-"/]	c #F3EA4A",
-"(]	c #958E2D",
-"_]	c #8C852B",
-":]	c #938C2D",
-"<]	c #706B22",
-"[]	c #1E1D09",
-"}]	c #C0B638",
-"|]	c #FEE249",
-"1]	c #756522",
-"2]	c #C6BB38",
-"3]	c #D0C43A",
-"4]	c #958C29",
-"5]	c #746E20",
-"6]	c #625C1B",
-"7]	c #7F7723",
-"8]	c #A69C2D",
-"9]	c #EBDC3F",
-"0]	c #FEEE44",
-"a]	c #F9FB61",
-"b]	c #141408",
-"c]	c #96963A",
-"d]	c #B6B645",
-"e]	c #A8A73E",
-"f]	c #7A792D",
-"g]	c #E9E756",
-"h]	c #75742A",
-"i]	c #1F1F0B",
-"j]	c #A4A23A",
-"k]	c #21200C",
-"l]	c #8B8830",
-"m]	c #A19D37",
-"n]	c #9F9B35",
-"o]	c #59561D",
-"p]	c #191908",
-"q]	c #F9F04F",
-"r]	c #ECE44B",
-"s]	c #F4EB4D",
-"t]	c #E5DD49",
-"u]	c #ADA637",
-"v]	c #383612",
-"w]	c #494616",
-"x]	c #A29B32",
-"y]	c #5B581C",
-"z]	c #9F972E",
-"A]	c #9D872D",
-"B]	c #4E4A17",
-"C]	c #575219",
-"D]	c #68621E",
-"E]	c #7C7523",
-"F]	c #918929",
-"G]	c #D8CC3D",
-"H]	c #FEEA42",
-"I]	c #FAF760",
-"J]	c #23240E",
-"K]	c #868734",
-"L]	c #575721",
-"M]	c #ECEC5A",
-"N]	c #939337",
-"O]	c #48481B",
-"P]	c #9D9C3A",
-"Q]	c #BEBD45",
-"R]	c #666425",
-"S]	c #D6D24C",
-"T]	c #EFEB54",
-"U]	c #FDE950",
-"V]	c #817C2B",
-"W]	c #24240C",
-"X]	c #6E6B24",
-"Y]	c #9F9A33",
-"Z]	c #4D4A18",
-"`]	c #3A3812",
-" ^	c #1A1908",
-".^	c #23220A",
-"+^	c #24220B",
-"@^	c #2C290D",
-"#^	c #655F1E",
-"$^	c #C3A738",
-"%^	c #ECCB44",
-"&^	c #FEE849",
-"*^	c #FDE954",
-"=^	c #333314",
-"-^	c #76772E",
-";^	c #F7F75F",
-">^	c #C0C049",
-",^	c #E2E256",
-"'^	c #B7B645",
-")^	c #1C1C0B",
-"!^	c #838230",
-"~^	c #56551F",
-"{^	c #F0EC55",
-"]^	c #F8F458",
-"^^	c #807E2D",
-"/^	c #FAD647",
-"(^	c #28250D",
-"_^	c #F3ED53",
-":^	c #9E9A35",
-"<^	c #C5BF41",
-"[^	c #29280D",
-"}^	c #DAD143",
-"|^	c #494516",
-"1^	c #5A561C",
-"2^	c #7D7826",
-"3^	c #97902D",
-"4^	c #C3BB3B",
-"5^	c #D9CF41",
-"6^	c #EEE348",
-"7^	c #43431A",
-"8^	c #676728",
-"9^	c #C9C94C",
-"0^	c #EAE855",
-"a^	c #454519",
-"b^	c #23220D",
-"c^	c #E0DC4F",
-"d^	c #F7F357",
-"e^	c #F1CF45",
-"f^	c #524718",
-"g^	c #827F2C",
-"h^	c #F7F153",
-"i^	c #FAF353",
-"j^	c #6A6622",
-"k^	c #56531B",
-"l^	c #767225",
-"m^	c #918C2D",
-"n^	c #A39C33",
-"o^	c #AFA837",
-"p^	c #B6AF39",
-"q^	c #B9B23A",
-"r^	c #BCB53B",
-"s^	c #BEB73B",
-"t^	c #BCB53A",
-"u^	c #C4BC3D",
-"v^	c #ECE349",
-"w^	c #FCEC57",
-"x^	c #525320",
-"y^	c #575722",
-"z^	c #FAFA61",
-"A^	c #C1C049",
-"B^	c #EFEE5A",
-"C^	c #302F12",
-"D^	c #E7E556",
-"E^	c #EEEC57",
-"F^	c #3D3C16",
-"G^	c #28280E",
-"H^	c #171708",
-"I^	c #D1CE4A",
-"J^	c #6C6A26",
-"K^	c #ADAA3D",
-"L^	c #D3CF4A",
-"M^	c #DFDA4E",
-"N^	c #E5CC45",
-"O^	c #D2B53C",
-"P^	c #67591E",
-"Q^	c #090803",
-"R^	c #414016",
-"S^	c #F7F355",
-"T^	c #989533",
-"U^	c #7B7729",
-"V^	c #FCF453",
-"W^	c #D0C943",
-"X^	c #C0BA3E",
-"Y^	c #F4EB4E",
-"Z^	c #FDF14C",
-"`^	c #FEEE45",
-" /	c #FEED45",
-"./	c #616226",
-"+/	c #43441A",
-"@/	c #858533",
-"#/	c #6B6A28",
-"$/	c #4D4C1D",
-"%/	c #F3F15A",
-"&/	c #F7F55B",
-"*/	c #9C9B39",
-"=/	c #1C1B0A",
-"-/	c #AEAC3F",
-";/	c #E6E453",
-">/	c #8F8E34",
-",/	c #E1DD50",
-"'/	c #F1ED55",
-")/	c #625E21",
-"!/	c #F9F455",
-"~/	c #C8C343",
-"{/	c #DED749",
-"]/	c #5D5E24",
-"^/	c #F8F961",
-"//	c #F8F75E",
-"(/	c #ABAB41",
-"_/	c #21210C",
-":/	c #8D8C34",
-"</	c #C1BF47",
-"[/	c #CAC94A",
-"}/	c #B3B142",
-"|/	c #949336",
-"1/	c #676626",
-"2/	c #191909",
-"3/	c #C6C448",
-"4/	c #353413",
-"5/	c #A3A03A",
-"6/	c #55541E",
-"7/	c #C7AB39",
-"8/	c #FCED52",
-"9/	c #9B9834",
-"0/	c #4E4C1A",
-"a/	c #FEEA4A",
-"b/	c #FEEA43",
-"c/	c #F0F25F",
-"d/	c #878734",
-"e/	c #EBEB5B",
-"f/	c #F5F55E",
-"g/	c #E8E859",
-"h/	c #D8D853",
-"i/	c #C8C84D",
-"j/	c #B8B847",
-"k/	c #A8A841",
-"l/	c #99993B",
-"m/	c #898934",
-"n/	c #79792E",
-"o/	c #686827",
-"p/	c #46461B",
-"q/	c #7C7C2F",
-"r/	c #8B8A34",
-"s/	c #353513",
-"t/	c #DDDB51",
-"u/	c #656525",
-"v/	c #D8D54E",
-"w/	c #23220C",
-"x/	c #0C0B04",
-"y/	c #E4E151",
-"z/	c #E8E351",
-"A/	c #A09D38",
-"B/	c #696725",
-"C/	c #464519",
-"D/	c #383714",
-"E/	c #3C3A15",
-"F/	c #4D4216",
-"G/	c #5C4F1A",
-"H/	c #8A7627",
-"I/	c #DEBF40",
-"J/	c #88842E",
-"K/	c #1D1C0A",
-"L/	c #D1CC47",
-"M/	c #FBF35D",
-"N/	c #F5F760",
-"O/	c #AAAB43",
-"P/	c #93943A",
-"Q/	c #999B3C",
-"R/	c #7C7D31",
-"S/	c #27270F",
-"T/	c #838331",
-"U/	c #A1A03C",
-"V/	c #373614",
-"W/	c #F8F65A",
-"X/	c #908E34",
-"Y/	c #383814",
-"Z/	c #1A1A09",
-"`/	c #48471A",
-" (	c #929034",
-".(	c #EFEB56",
-"+(	c #FBF75A",
-"@(	c #E0DD50",
-"#(	c #AAA73C",
-"$(	c #DCD84E",
-"%(	c #8F8C31",
-"&(	c #8E8B30",
-"*(	c #58551D",
-"=(	c #606126",
-"-(	c #2E2E11",
-";(	c #E6E556",
-">(	c #F4F35B",
-",(	c #AFAE41",
-"'(	c #75752C",
-")(	c #54531F",
-"!(	c #3E3E17",
-"~(	c #454419",
-"{(	c #53531F",
-"](	c #696827",
-"^(	c #989738",
-"/(	c #373613",
-"((	c #C6C142",
-"_(	c #E4DE4C",
-":(	c #FAF961",
-"<(	c #333414",
-"[(	c #323213",
-"}(	c #52521F",
-"|(	c #626226",
-"1(	c #71712C",
-"2(	c #818131",
-"3(	c #919137",
-"4(	c #A2A23E",
-"5(	c #AFAF42",
-"6(	c #B8B746",
-"7(	c #C5C44B",
-"8(	c #C8C74C",
-"9(	c #C7C64B",
-"0(	c #D1D04E",
-"a(	c #F9F85D",
-"b(	c #353312",
-"c(	c #D5D048",
-"d(	c #AAA639",
-"e(	c #BDB83F",
-"f(	c #AAAC43",
-"g(	c #26260F",
-"h(	c #1B1B0B",
-"i(	c #353515",
-"j(	c #4B4B1D",
-"k(	c #626327",
-"l(	c #797A30",
-"m(	c #909138",
-"n(	c #A7A941",
-"o(	c #BBBB49",
-"p(	c #DDDD56",
-"q(	c #ECED5C",
-"r(	c #716F27",
-"s(	c #ACA83A",
-"t(	c #C8C344",
-"u(	c #BBB73F",
-"v(	c #908D31",
-"w(	c #FEDF4D",
-"x(	c #FEE74A",
-"y(	c #111006",
-"z(	c #F4EE52",
-"A(	c #FEEB43",
-"B(	c #FEE44D",
-"C(	c #C2BD42",
-"D(	c #817E2C",
-"E(	c #5C5A1F",
-"F(	c #53511C",
-"G(	c #59571E",
-"H(	c #757227",
-"I(	c #A29E37",
-"J(	c #F4EE53",
-"K(	c #FEEB46",
-"L(	c #FEE946",
-"M(	c #FEE546",
-"N(	c #FFE447",
-"O(	c #FFE347",
-"P(	c #FAF962",
-"Q(	c #FDEC47",
-"R(	c #FEE348",
-"S(	c #FFE048",
-"T(	c #FDEE49",
-"U(	c #FDEA49",
-"V(	c #FEE949",
-"W(	c #FDEA51",
-"X(	c #FDF04C",
-"Y(	c #FDEF4C",
-"Z(	c #FBF354",
-"`(	c #FCF14F",
-" _	c #FCEF4F",
-"._	c #FDEC4E",
-"+_	c #FDEA4E",
-"@_	c #FEE14B",
-"#_	c #FCF251",
-"$_	c #FDEF50",
-"%_	c #FDED50",
-"&_	c #FDEB4F",
-"*_	c #FDE84E",
-"=_	c #FEE74D",
-"-_	c #FEE54C",
-";_	c #FEE44C",
-">_	c #FCF253",
-",_	c #FCF052",
-"'_	c #FCEC50",
-")_	c #FDE74E",
-"!_	c #FCF055",
-"~_	c #FCED53",
-"{_	c #FAF65C",
-"]_	c #FCEF56",
-"^_	c #FCEA54",
-"/_	c #FDE952",
-"(_	c #FBF65D",
-"__	c #FBF45B",
-":_	c #FCF058",
-"<_	c #FBF35C",
-"[_	c #FBF15A",
-"}_	c #FBEF58",
-"|_	c #FCED56",
-"1_	c #FCEA55",
-"2_	c #FCE853",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          . +                                                 ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          + + + + @ + + + + + + + + + + + + @                                                 ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                          + + @ + + @ + + + + + + + + + + + + + + + + + + + + + + + + + + + +                                                 ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                          + . . + + + + @ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +                                                 ",
-"                                                                                                                                                                                                                                                                                                                                                                                                          + + . + + + + . + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +                                                 ",
-"                                                                                                                                                                                                                                                                                                                                                                          + . + + . @ . + @ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +                                               ",
-"                                                                                                                                                                                                                                                                                                                                            . + + + + @ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +                                               ",
-"                                                                                                                                                                                                                                                                                                            + + + . + + + . + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + # $ % & * = - ; > , ' ) ! + + + + + +                                               ",
-"                                                                                                                                                                                                                                                                            + + . + + @ + @ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ~ $ { ] ^ / ( _ : < [ } | 1 2 2 2 3 3 3 3 3 3 3 4 4 4 4 ; + + + + + +                                               ",
-"                                                                                                                                                                                                                                            + + + + + + + @ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ~ 5 6 ] 7 8 9 0 a b c d e f g g g g g h h h h h h h i j j j j 2 2 3 3 3 3 3 3 3 4 4 4 4 , + + + + + +                                               ",
-"                                                                                                                                                                                                            + + + + @ @ + . + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ~ k 6 l m n o p q r s t u v w x w w w w w y y y y y y y z z z g g g g h h h h h h h i j j j j 2 2 3 3 3 3 3 3 3 4 4 4 4 A + + + + + +                                               ",
-"                                                                                                                                                                            + + + + + + + + @ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ~ k B l C D E F G H I J K L M N O P P P P P P Q Q Q Q Q Q Q x x w w w w w y y y y y y y z z z g g g g h h h h h h h i j j j j 2 2 3 3 3 3 3 3 3 4 4 4 4 4 + + + + + + +                                             ",
-"                                                                                                                                            + . + + + + . + @ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ~ R ~ + + + + + S T U V W X Y Z Z `  . . . . . . .....N N N N N O P P P P P P Q Q Q Q Q Q Q x x w w w w w y y y y y y y z z z g g g g h h h h h h h i j j j j 2 2 3 3 3 3 3 3 3 4 4 4 4 4 % + + + + + @                                             ",
-"                                                                                                              + + + + + @ + @ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ~ R +.@.#.$.%.&.*.=.-.;.>.,.'.).!.!.C + + + + + C ~.~.Z Z Z Z Z Z `  . . . . . . .....N N N N N O P P P P P P Q Q Q Q Q Q Q x x w w w w w y y y y y y y z z z g g g g h h h h h h h i j j j j 2 2 3 3 3 3 3 3 3 4 4 4 4 4 ; + + + + + +                                             ",
-"                                                                              + + + . @ + @ @ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R S @.#.{.].^./.(._.:.<.[.}.|.1.1.1.|.|.|.2.2.2.2.2.2.2.!.!.!.!.!.$.+ + + + + 3.~.~.Z Z Z Z Z Z `  . . . . . . .....N N N N N O P P P P P P Q Q Q Q Q Q Q x x w w w w w y y y y y y y z z z g g g g h h h h h h h i j j j j 2 2 3 3 3 3 3 3 3 4 4 4 4 4 A + + + + + + +                                           ",
-"                                              + + + + + @ @ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R 4.@.5.6.].7.8.9.0.a.b.c.d.e.f.f.f.g.g.g.g.h.h.h.h.i.i.i.i.1.1.1.1.|.|.|.2.2.2.2.2.2.2.!.!.!.!.!.j.+ + + + + ~ ~.~.Z Z Z Z Z Z `  . . . . . . .....N N N N N O P P P P P P Q Q Q Q Q Q Q x x w w w w w y y y y y y y z z z g g g g h h h h h h h i j j j j 2 2 3 3 3 3 3 3 3 4 4 4 4 4 4 # + + + + + @                                           ",
-"                                  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R k.l.5.6.m.n.o.p.q.r.s.t.u.v.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.g.g.g.g.h.h.h.h.i.i.i.i.1.1.1.1.|.|.|.2.2.2.2.2.2.2.!.!.!.!.!.*.+ + + + + + z.~.Z Z Z Z Z Z `  . . . . . . .....N N N N N O P P P P P P Q Q Q Q Q Q Q x x w w w w w y y y y y y y z z z g g g g h h h h h h h i j j j j 2 2 3 3 3 3 3 3 3 4 4 4 4 4 4 = + + + + + +                                           ",
-"                                  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R k.l.A.B.C.n.o.D.E.F.G.H.I.J.K.K.K.K.L.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.g.g.g.g.h.h.h.h.i.i.i.i.1.1.1.1.|.|.|.2.2.2.2.2.2.2.!.!.!.!.!.N.+ + + + + + X ~.Z Z Z Z Z Z `  . . . . . . .....N N N N N O P P P P P P Q Q Q Q Q Q Q x x w w w w w y y y y y y y z z z g g g g h h h h h h h i j j j j 2 2 3 3 3 3 3 3 3 4 4 4 4 4 4 ' + + + + + +                                           ",
-"                                  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + O.k.l.A.P.C.Q.4.+ + + + + R.S.T.T.T.T.U.V.V.V.V.V.V.W.W.W.W.W.W.W.K.K.K.X.X.X.X.M.M.M.M.M.M.M.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.e.g.g.g.g.g.g.g.i.i.i.i.i.i.i.1.|.|.|.|.|.|.2.2.2.2.2.2.2.!.!.;.+ + + + + + Z.~.~.~.Z Z Z Z ` ` `  . . . . . . .N N N N N N M P P P P P P P Q Q Q Q Q Q Q w w w w w w w y y y y y y y z g g g g g h h h h h h h j j j j 2 2 2 3 3 3 3 3 3 3 4 4 4 4 4 `.~ + + + + + +                                         ",
-"                                  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + O. +l..+P.++@+#+$+%+&+*+=+-+;+>+,+,+,+,+,+'+'+)++ + + + + !+T.T.T.T.T.U.V.V.V.V.V.V.W.W.W.W.W.W.W.K.K.K.X.X.X.X.M.M.M.M.M.M.M.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.e.g.g.g.g.g.g.g.i.i.i.i.i.i.i.1.|.|.|.|.|.|.2.2.2.2.2.2.2.!.!.~++ + + + + + U ~.~.~.Z Z Z Z ` ` `  . . . . . . .N N N N N N M P P P P P P P Q Q Q Q Q Q Q w w w w w w w y y y y y y y z g g g g g h h h h h h h j j j j 2 2 2 3 3 3 3 3 3 3 4 4 4 4 4 `.! + + + + + +                                         ",
-"                                  + + + + + + + + + + + + + + + + + + + + + O.k.{+.+]+^+@+/+(+_+:+<+[+}+|+1+2+3+3+3+3+3+1+4+4+4+4+4+4+4+,+,+,+,+,+,+,+'+'+5++ + + + + R T.T.T.T.T.U.V.V.V.V.V.V.W.W.W.W.W.W.W.K.K.K.X.X.X.X.M.M.M.M.M.M.M.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.e.g.g.g.g.g.g.g.i.i.i.i.i.i.i.1.|.|.|.|.|.|.2.2.2.2.2.2.2.!.!.'.+ + + + + + 6+~.~.~.Z Z Z Z ` ` `  . . . . . . .N N N N N N M P P P P P P P Q Q Q Q Q Q Q w w w w w w w y y y y y y y z g g g g g h h h h h h h j j j j 2 2 2 3 3 3 3 3 3 3 4 4 4 4 4 `.' + + + + + + +                                       ",
-"                                  + + + + + + 7+{+.+8+^+9+/+0+a+b+c+d+e+f+g+h+h+h+i+i+i+g+g+g+g+2+2+2+2+2+2+2+3+3+3+3+3+1+4+4+4+4+4+4+4+,+,+,+,+,+,+,+'+'+j++ + + + + + V.T.T.T.T.U.V.V.V.V.V.V.W.W.W.W.W.W.W.K.K.K.X.X.X.X.M.M.M.M.M.M.M.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.e.g.g.g.g.g.g.g.i.i.i.i.i.i.i.1.|.|.|.|.|.|.2.2.2.2.2.2.2.!.!.).3.+ + + + + k+~.~.~.Z Z Z Z ` ` `  . . . . . . .N N N N N N M P P P P P P P Q Q Q Q Q Q Q w w w w w w w y y y y y y y z g g g g g h h h h h h h j j j j 2 2 2 3 3 3 3 3 3 3 4 4 4 4 4 `.`.# + + + + + +                                       ",
-"                                  + + + + + + l+m+m+m+n+n+o+o+o+o+o+h+h+h+h+h+h+h+i+i+i+g+g+g+g+2+2+2+2+2+2+2+3+3+3+3+3+1+4+4+4+4+4+4+4+,+,+,+,+,+,+,+'+'+p++ + + + + + q+T.T.T.T.U.V.V.V.V.V.V.W.W.W.W.W.W.W.K.K.K.X.X.X.X.M.M.M.M.M.M.M.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.e.g.g.g.g.g.g.g.i.i.i.i.i.i.i.1.|.|.|.|.|.|.2.2.2.2.2.2.2.!.!.).k++ + + + + S ~.~.~.Z Z Z Z ` ` `  . . . . . . .N N N N N N M P P P P P P P Q Q Q Q Q Q Q w w w w w w w y y y y y y y z g g g g g h h h h h h h j j j j 2 2 2 3 3 3 3 3 3 3 4 4 4 4 4 `.`.r++ + + + + +                                       ",
-"                                  + + + + + + s+m+m+m+n+n+o+o+o+o+o+h+h+h+h+h+h+h+i+i+i+g+g+g+g+2+2+2+2+2+2+2+3+3+3+3+3+1+4+4+4+4+4+4+4+,+,+,+,+,+,+,+'+'+t++ + + + + + u+T.T.T.T.U.V.V.V.V.V.V.W.W.W.W.W.W.W.K.K.K.X.X.X.X.M.M.M.M.M.M.M.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.e.g.g.g.g.g.g.g.i.i.i.i.i.i.i.1.|.|.|.|.|.|.2.2.2.2.2.2.2.!.!.).j.+ + + + + ~ ~.~.~.Z Z Z Z ` ` `  . . . . . . .N N N N N N M P P P P P P P Q Q Q Q Q Q Q w w w w w w w y y y y y y y z g g g g g h h h h h h h j j j j 2 2 2 3 3 3 3 3 3 3 4 4 4 4 4 `.`.v++ + + + + + +                                     ",
-"                                  + + + + + + w+m+m+m+n+n+o+o+o+o+o+h+h+h+h+h+h+h+i+i+i+g+g+g+g+2+2+2+2+2+2+2+3+3+3+3+3+1+4+4+4+4+4+4+4+,+,+,+,+,+,+,+'+'+q++ + + + + + x+T.T.T.T.U.V.V.V.V.V.V.W.W.W.W.W.W.W.K.K.K.X.X.X.X.M.M.M.M.M.M.M.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.e.g.g.g.g.g.g.g.i.i.i.i.i.i.i.1.|.|.|.|.|.|.2.2.2.2.2.2.2.!.!.).N.+ + + + + + y+~.~.Z Z Z Z ` ` `  . . . . . . .N N N N N N M P P P P P P P Q Q Q Q Q Q Q w w w w w w w y y y y y y y z g g g g g h h h h h h h j j j j 2 2 2 3 3 3 3 3 3 3 4 4 4 4 4 `.`.z+! + + + + + +                                     ",
-"                                  + + + + + + A+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+;++ + + + + + D+T.T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.F++ + + + + + U ~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+' + + + + + + +                                   ",
-"                                  + + + + + + f+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+R + + + + + ++T.T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.).+ + + + + + N+~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+# + + + + + @                                   ",
-"                                + + + + + + O.o+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+A.+ + + + + R.T.T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.3.+ + + + + D ~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+O++ + + + + + +                                 ",
-"                                + + + + + + {+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+P++ + + + + R T.T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.#.+ + + + + 3.~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+`.~ + + + + + @                                 ",
-"                                . + + + + + Q+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+R++ + + + + + S+T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.T++ + + + + + ,.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+U++ + + + + +                                 ",
-"                                @ + + + + + 0+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+V++ + + + + + W+T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.X++ + + + + + U ~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+Y++ + + + + + @                               ",
-"                                + + + + + + Z+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+;++ + + + + + `+T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.).+ + + + + + %.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+ @+ + + + + +                               ",
-"                                + + + + + + w+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+7++ + + + + ++T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!..@+ + + + + S ~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M++@+ + + + + + +                             ",
-"                              . + + + + + ~ o+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+.++ + + + + R.T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.j.+ + + + + + ,.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+% + + + + + +                             ",
-"                              @ + + + + + {+m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+Q.+ + + + + O.;+T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.@@+ + + + + + U Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+#@+ + + + + + +                           ",
-"                              @ + + + + + $@m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+%@+ + + + + + &@T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.'.+ + + + + + %.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+M+# + + + + + @                           ",
-"                              + + + + + + c+m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+S++ + + + + + *@T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.!.S + + + 3.$.@@Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+M+> + + + + + + +                         ",
-"                            + + + + + + + =@m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+C+ ++ + + + + -@T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.!.*.%.U z.;@~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+M+z+>@+ + + + + +                         ",
-"                            + + + + + + ,@m+m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C.+ + + + + O.;+T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.!.!.;@;@;@;@~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+M+M+'@+ + + + + + +                       ",
-"                            + + + + + + )@m+m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+C+$++ + + + + + u+T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.!.!.;@;@;@;@~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+M+M+!@+ + + + + + +                       ",
-"                            + + + + + + ~@m+m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+C+{@+ + + + + + `+T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.!.!.;@;@;@;@~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+M+M+]@^@+ + + + + +                       ",
-"                          + + + + + + ~ /@m+m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+C+'+7++ + + + + -@T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.!.!.;@;@;@;@~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+M+M+]@(@+ + + + + + .                     ",
-"                          + + + + + + _@m+m+m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+C+'+]++ + l.P+x+S.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.!.!.;@;@;@;@~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+M+M+]@]@:@+ + + + + +                     ",
-"                          + + + + + + <@m+m+m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+C+'+t+[@V.T.T.T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.!.!.;@;@;@;@~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+M+M+]@]@}@+ + + + + + +                   ",
-"                        + + + + + + + |@m+m+m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+C+'+'+T.T.T.T.T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.!.!.;@;@;@;@~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+M+M+]@]@z+~ + + + + + +                   ",
-"                        @ + + + + + {+1@m+m+m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+C+'+'+T.T.T.T.T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.!.!.;@;@;@;@~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+M+M+]@]@]@^@+ + + + + +                   ",
-"                        + + + + + + )@1@m+m+m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+C+'+'+T.T.T.T.T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.!.!.;@;@;@;@~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+M+M+]@]@]@(@+ + + + + + +                 ",
-"                        + + + + + + l+1@m+m+m+m+m+m+m+n+n+n+n+n+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+i+2+2+2+2+2+2+2+3+3+3+3+3+3+B+B+B+4+4+4+4+,+,+,+,+,+,+,+C+C+C+C+C+'+'+T.T.T.T.T.T.T.U.U.U.U.U.U.U.W.W.W.W.W.W.W.K.K.K.K.K.K.K.L.L.M.M.M.M.M.w.w.w.w.w.w.x.x.x.x.x.v.v.y.y.y.y.y.y.y.f.f.f.f.f.f.f.i.i.i.i.i.i.i.1.1.1.1.1.1.1.E+E+2.2.2.2.2.!.!.!.!.!.!.!.;@;@;@;@~.~.Z Z Z Z Z Z Z G+G+G+G+G+G+G+N N N N N N N O O O O O O O H+H+Q Q Q Q Q x x x x x x x I+I+I+I+y y y z z z z z z J+J+J+J+J+J+J+j j j j j j j K+K+K+K+K+K+K+L+L+4 4 4 4 4 M+M+M+M+M+M+M+]@]@]@]@:@+ + + + + @                 ",
-"                      + + + + + + 7+1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.U.U.3@3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.~.~.~.~.~.Z Z Z Z Z Z Z G+G+5@5@5@5@5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+O++ + + + + +                 ",
-"                      + + + + + + 7@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.U.U.3@3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.~.~.~.X 6+Z Z Z Z Z Z Z G+G+5@5@5@5@5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+(@+ + + + + + +               ",
-"                      + + + + + + 8@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.U.U.3@3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.~.9@k++ + W Z Z Z Z Z Z G+G+5@5@5@5@5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+# + + + + + @               ",
-"                    + + + + + + O./@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.U.U.3@3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.Z.k++ + + + k+Z Z Z Z Z Z G+G+5@5@5@5@5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+U++ + + + + +               ",
-"                    @ + + + + + 8+1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.U.U.3@3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.z.~ + + + + + + W Z Z Z Z Z G+G+5@5@5@5@5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+0@+ + + + + +               ",
-"                    + + + + + + a@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.U.U.3@3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.6++ + + + + + k+Z Z Z Z Z G+G+5@5@5@5@5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+>@+ + + + + +             ",
-"                  + + + + + + + b@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.U.U.3@3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.z.~ + + + + + + W Z Z Z Z G+G+5@5@5@5@5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+! + + + + + @             ",
-"                  @ + + + + + ,@1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.V.D.l.c@U.U.3@3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.T++ + + + + + k+Z Z Z Z G+G+5@5@5@5@5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+d@+ + + + + +             ",
-"                  + + + + + + 0+1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.S.*@R + + D+U.U.3@3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.,.~ + + + + + + e@Z Z Z G+G+5@5@5@f@5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@g@h@i@j@k@j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+0@+ + + + + +             ",
-"                  + + + + + + w+1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.*@O.+ + + + k.V.U.3@3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.~.j.+ + + + + + .@Z Z Z G+l@m@n@o@p@5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y q@r@s@t@y y z u@v@w@x@y@z@A@B@v@6@6@C@D@E@F@G@H@I@J@j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+K@+ + + + + +             ",
-"                @ + + + + + R 1@1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.R.+ + + + + + D+U.3@3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.~.,.~ + + + + + + L@Z Z G+M@N@O@P@Q@5@N N N N N N N O O O O P P R@S@Q Q T@U@V@W@X@x x x x x Y@Z@`@ #.#+#@###z $#%#&#*#=#-#;#>#+#,#6@'#=#)#j j !#~#{#j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+]#~ + + + + + +           ",
-"                @ + + + + + ^#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.W++ + + + + + k.V.3@3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.(#_#:#<#[#1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.~.~.N++ + + + + + 5 ` Z G+G+5@5@}#|#5@N N N N N N N 1#2#3#4#5#6#`@*#7#8#9#0#a#b#c#d#x x x e#f#g#h#y y i#j#k#l#z z m#*#n#z o#p#*#q#r#*#s#j t#u#v#w#*#x#K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+]#:@+ + + + + .           ",
-"                + + + + + + y#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.R.+ + + + + + R+3@3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.z#A#B#C#D#E#F#G#H#I#f.f.f.4@4@J#K#L#M#*#*#*#*#N#1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.~.O#P#Q#@ + + + + + R#S#T#U#N#V#W#T#5@N N N N N N N X#Y#Z#*#`# $.$+$@$*##$$$Q $$%$&$x x x *$=$-$y y y y ;$*#>$z z ,$*#'$z )$!$~${$g@*#]$^$*#*#A@H@/$($K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+]#! + + + + + +           ",
-"                + + + + + + A+/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.W++ + + + + + k._$3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.:$<$[$}$|$1$2$3$4$*#*#*#*#5$6$7$8$2$9$0$a$f.4@4@b$c$d$e$f$g$h$i$j$1.1.1.1.1.|.|.2.2.2.k$l$m$n$o$!.!.!.p$q$r$s$p$q$t$2$9$u$v$+ + + + w$c#x$y$z$A$B$C$5@N N N N N N N O O X#*#D$P P Q E$*#F$Q Q Q G$+#H$x x I$J$y y y y y y .#K$z z L$*#M$z J+6@6@6@N$*#O$P$Q$t#j j R$S$K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+]#'@+ + + + + +           ",
-"              + + + + + + 7+/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.R.+ + + + + + T$3@W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.U$V$W$+#c#X$Y$Z$`$ %.%+%*#@%y.y.y.#%$%B$%%f.4@4@2$&%i.i.*%=%-%;%i.1.1.1.1.1.|.|.2.2.>%U#,%'%)%*#!%!.!.~%{%]%*#^%/%(%~._%:%<%[%+ + }%*#|%G+G+5@5@1%2%5@N N N N N N N O O 3%*#4%P P Q 5%*#6%Q Q Q 7%*#X@x x 8%9%y y y y y y m@~$z z z 2%0%z J+6@6@6@a%B$b%j j j j c%*#d%K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+]#O++ + + + + +           ",
-"              @ + + + + + Q+/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.W++ + + + + + O.q+W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.e%f%x.v.v.v.v.v.g%*#h%y.y.y.y.f.i%*#j%4@4@k%l%i.m%n%o%p%i.i.1.1.1.1.1.|.|.2.q%*#r%2.2.2.s%t%!.!.!.!.u%*#v%~.~.~.~.w%*#x%+ + y%B$z%e@G+5@5@A%*#B%N N N N N N N O O C%*#D%P P Q E%*#F%Q Q Q G%*#H%x x I%J%K%y y y y L%M%N%z z z O%P%z J+6@6@6@6@Q%9$R%j j S%T%U%j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+]#r++ + + + + +           ",
-"              + + + + + + V%/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.A.+ + + + + + W%W.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.X%Y%x.v.v.v.v.v.Z%*#`%y.y.y.y.f. &*#.&4@4@4@4@i.+&*#@&#&J#$&1.1.1.1.1.|.|.2.%&i$&&2.2.*&=&-&!.!.!.!.!.c#;&~.~.~.~.>&*#,&+ + '&t$+ B G+5@5@)&*#!&N N N N N N N O O O c#~&P P Q {&*#]&Q Q Q ^&*#/&x x (&*#_&y y y :&<&c#y@z [&;$}&9#|&1&2&6@6@6@3&4&`@5&6&`@7&8&j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+]#'@+ + + + + +           ",
-"              + + + + + + 9&/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.u++ + + + + + + 0&W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.a&+#b&v.v.v.v.v.4$*#c&y.y.y.y.f.f.d&e&4@4@4@4@m%f&e$j$g&h&`@i&1.1.1.1.|.|.2.2.j&k&l&m&n&o&*#p&!.!.!.!.N#q&~.~.~.~.r&*#s&+ + t&*#u&+ H 5@5@v&*#N@N N N N N N N O O O f#w&P P Q x&*#y&Q Q z&A&*#B&d#C&x D&`@D@E&F&H@G&H&z z =#~#z@I&J&%#K&6@6@6@6@6@L&M&N&O&j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+]#P&+ + + + + +           ",
-"              + + + + + + Q&/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.m.+ + + + + + A.W.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.R&*#S&v.v.v.v.v.T&*#U&y.y.y.y.f.f.V&W&4@4@X&f&Y&i.i.i.i.Z&`@`&1.1.1.1.|.|.2. *=&.*+*@*#*$**#%*&***!.!.=*-*~.~.~.~.;*+#>*+ + ,**#'*+ k )*5@!**#~*N N N N N N N O {*]*M%^*/*(*_*:**#}&N#<*[*}*%$|*1*2*x w 3*4*5*6*7*8*y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+]#U++ + + + + +           ",
-"            + + + + + + k.9*/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.0*~ + + + + + + F.W.W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.a**#b*v.v.v.v.v.c**#d*y.y.y.y.f.e*f*8$4@g*B$*#h*i.i.i.i.i.2$i*1.1.1.1.|.|.2.l&A@j*2.2.2.k**#l*m*n*!.!.o*p*~.~.~.~.q*B$r*s*t*+ u**#v*w*x*A$y**#=*z*A*N N N N N B*6#C*D*E*F*G*H*8#I*J*Y@$$Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+]#U++ + + + + +           ",
-"            @ + + + + + K*9*/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.o.+ + + + + + 4._$W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.L**#M*v.v.v.v.v.N**#O*y.y.y.y.f.P**#Q*4@R**#S*T*i.i.i.i.U*+#V*1.1.1.1.|.|.2.l&d&W*2.2.X*Y*+#Z*`*q$ =.=.*o%+=@=~.#=$=*#+#`@%=+ + &=*===-=;=>=,='=)=!=N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+]#^@+ + + + + @           ",
-"            + + + + + + ~=9*/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.{=O.+ + + + + + T$W.W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.]=*#^=v.v.v.v.v./=*#(=y.y.y.y._=:=<=[=4@}=|=1=2=i.i.i.3=Y*4=5=1.1.1.1.|.|.2.6=4=7=8=9=b$0=a=*#i$b=q$c=d=e=f=g=~.h=i=j=Z k=C + + + + + + .@5@5@5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+]#l=+ + + + + +           ",
-"            + + + + + + V%9*/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.E.+ + + + + + O.m=W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.n=*#o=v.v.v.v.v.p=*#q=r=s=t=u=v=@&w=f.4@4@x=y=9$z=A=#&*#B=C=1.1.1.1.1.|.|.2.2.D=E=F=G=H=!.I=%*J=!.!.!.~.~.~.~.~.~.~.Z Z Z y++ + + + + + + K=5@5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+]## + + + + + +           ",
-"            + + + + + + L=9*/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.l.+ + + + + + M=W.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.N=O=P=*#Q=R=S=T=U=V=W=*#*#*#*#`@X=Y=Z=f.f.4@4@4@`=$&d$ -.-_#i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.~.~.~.~.~.Z Z Z Z F + + + + + + k 5@5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@j j j j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+!@+ + + + + +             ",
-"            + + + + + + +-9*/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.@-+ + + + + + + #-W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.$-%-&-*-=---;->-,-'-)-!-~-{-]-@%#%y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.~.~.~.~.~.Z Z Z Z ` k + + + + + + ^-5@N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y y z z z z z z z J+6@6@6@6@6@6@/-(-_-j j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+:-+ + + + + +             ",
-"            + + + + + + |@9*/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.U.C.+ + + + + + l.W.W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.~.~.~.~.~.Z Z Z Z Z L@+ + + + + + ~ <-N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y y y y t@[-}-|-D@1-2-m@3-4-5-6-6@6@6@7-*#8-P$j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+}@+ + + + + +             ",
-"            + + + + + + b@9*/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.U.{=O.+ + + + + + 9-W.K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.~.~.~.~.~.Z Z Z Z Z Z S + + + + + + E N N N N N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y y 0--#%$*#*#*#*#*#*#*#*#*#*#*#*#a-b-6@c-*#*#d-j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+P&+ + + + + .             ",
-"            + + + + + + e-9*/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.U.U.T$+ + + + + + R f-K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.~.~.~.~.~.Z Z Z Z Z Z e@+ + + + + + + L g-h-i-N N N O O O O P P P Q Q Q Q Q Q Q x x x x x x w y y j-2%*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#k-l-m-*#*#n-j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+! + + + + + +             ",
-"            + + + + + + o-9*/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.U.U.p-4.+ + + + + + W%K.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.!.~.~.~.~.~.~.~.Z Z Z Z Z Z Z k++ + + + + + q-}**#*#r-s-N O O O O P P P Q Q Q Q Q Q Q x x x x x x w t-u-*#*#*#*#*#v-w-x-y-z-A-B-C-D-E-*#*#*#*#+#*#*#F-j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+z+>@+ + + + + @             ",
-"            + + + + + + Q&9*/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.U.U.3@G-+ + + + + + + H-K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.I-J-K-L-M-m$N-O-P-Q-~.~.~.Z Z Z Z Z Z Z R-+ + + + + S-T-*#*#*#*#U-N O O O O P P P Q Q Q Q Q Q Q x x x x x x V-J%*#*#*#*#W-X-z z z z z z z J+6@6@Y-Z-*#*#*#*#*#`-j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z++@+ + + + + +               ",
-"            + + + + + +  ;9*/#/#1@1@1@1@1@m+m+m+m+m+m+m+n+n+n+n+o+o+o+h+h+h+h+h+h+h+i+i+i+i+i+i+2@2+2+2+2+2+2+2+3+3+3+3+3+3+3+B+4+4+4+4+4+4+,+,+,+,+,+,+,+C+C+C+'+'+'+'+T.T.T.T.T.T.T.U.U.U.U.U.3@3@6.+ + + + + + 6.K.K.K.K.K.K.M.M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.v.v.v.v.v.y.y.y.y.y.y.y.f.f.f.f.4@4@4@4@i.i.i.i.i..;+;[#@;#;$;%;&;*;=;-;;;c$A=v%>;t$*#*#*#*#*#*#*#*#*#-%(%~.~.Z Z Z Z Z Z Z G+E + + + + ,;*#*#*#*#*#*#';O O O O P P P Q Q Q Q Q Q Q x x x x x H$);*#*#*#*#!;~;y z z z z z z z J+6@6@6@{;];*#*#*#*#^;j j j K+K+K+3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+M+z+O++ + + + + +               ",
-"            + + + + + + |@9*9*9*/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+h+h+h+h+h+h+h+2@2@2@2@2@2@2@2+2+2+2+2+2+3+3+3+1+1+1+1+4+4+4+4+4+4+4+,+,+,+,+,+>+>+'+'+'+'+'+'+'+T.T.T.T.T.T.T.3@3@(;~ + + + + + + G.W.W.W.K.K.X.X.X.X.X.M.M.M.M.M.M.w.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.y.4@4@4@4@4@4@4@_;1=*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#h=~.~.~.~.Z Z Z Z Z Z Y ~ + + :;<;*#*#*#*#*#*#9#[;N O O P P P P P Q Q Q Q Q Q Q x x x };*#*#*#*#|;y y y y z z z z z z z 6@6@6@6@1;2;*#*#*#h@j j j j K+K+3 3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+z+! + + + + + @               ",
-"            + + + + + + 3;9*9*9*/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+h+h+h+h+h+h+h+2@2@2@2@2@2@2@2+2+2+2+2+2+3+3+3+1+1+1+1+4+4+4+4+4+4+4+,+,+,+,+,+>+>+'+'+'+'+'+'+'+T.T.T.T.T.T.T.3@3@3@P++ + + + + + l.W.W.W.K.K.X.X.X.X.X.M.M.M.M.M.M.w.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.y.4@4@4@4@4@4@4@=%*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#4;o&5;y=n&*#*#*#*#*#6;~.~.~.~.Z Z Z Z Z Z Z F + + 7;*#*#*#8;N#*#*#*#9;N O O P P P P P Q Q Q Q Q Q Q x x 0;+#*#*#*#I$0-y y y y z z z z z z z 6@6@6@6@6@a;*#*#*#b;j j j j K+K+3 3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+z+>@+ + + + + +               ",
-"            @ + + + + + <@9*9*9*/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+h+h+h+h+h+h+h+2@2@2@2@2@2@2@2+2+2+2+2+2+3+3+3+1+1+1+1+4+4+4+4+4+4+4+,+,+,+,+,+>+>+'+'+'+'+'+'+'+T.T.T.T.T.T.T.3@3@3@S+R + + + + + + E.W.W.K.K.X.X.X.X.X.M.M.M.M.M.M.w.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.y.4@4@4@4@4@4@4@c;*#*#*#*#*#9$d;=%e;`*1=*#*#*#*#*#f;g;h;2.!.!.i;j;4=*#*#*#k;~.~.~.~.Z Z Z Z Z Z Z )*~ + l;*#*#*#m;n;*#*#*#0#o;O O P P P P P Q Q Q Q Q Q Q x x p;*#*#*#*#q;y y y y y z z z z z z z 6@6@6@6@6@8&+#*#*#r;j j j j K+K+3 3 3 3 3 4 4 4 4 4 4 4 M+M+M+M++@+ + + + + +                 ",
-"            + + + + + + 7@9*9*9*/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+h+h+h+h+h+h+h+2@2@2@2@2@2@2@2+2+2+2+2+2+3+3+3+1+1+1+1+4+4+4+4+4+4+4+,+,+,+,+,+>+>+'+'+'+'+'+'+'+T.T.T.T.T.T.T.3@3@3@3@s;+ + + + + +  +W.W.K.K.X.X.X.X.X.M.M.M.M.M.M.w.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.y.4@4@4@4@4@4@4@t;*#*#*#u;v;(#1.1.|.|.|.c$*#*#*#*#w;2.2.2.!.!.!.!.x;*#*#*#y;~.~.~.~.Z Z Z Z Z Z Z 5@F z;A;*#*#*#B;C;b$*#*#*#D;O O P P P P P Q Q Q Q Q Q Q x E;+#*#*#*#&#y y y y y y z z z z z z z 6@6@6@6@6@6@k#*#*#F;j j j j K+K+3 3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+r++ + + + + +                 ",
-"            @ + + + + + G;9*9*9*/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+h+h+h+h+h+h+h+2@2@2@2@2@2@2@2+2+2+2+2+2+3+3+3+1+1+1+1+4+4+4+4+4+4+4+,+,+,+,+,+>+>+'+'+'+'+'+'+'+T.T.T.T.T.T.T.3@3@3@3@p-4.+ + + + + + 9-W.K.K.X.X.X.X.X.M.M.M.M.M.M.w.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.y.4@4@4@4@4@4@4@H;*#*#*#I;i.i.1.1.|.|.|.J;*#*#*#*#K;2.2.2.!.!.!.!.L;9$*#*#M;~.~.~.~.Z Z Z Z Z Z Z 5@<-N;*#*#*#O;o P;Q;*#*#*#R;O O P P P P P Q Q Q Q Q Q Q x S;*#*#*#*#T;y y y y y y z z z z z z z 6@6@6@6@6@6@3-*#*#U;j j j j K+K+3 3 3 3 3 4 4 4 4 4 4 4 M+M+M+M+% + + + + + @                 ",
-"            + + + + + + R 9*9*9*/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+h+h+h+h+h+h+h+2@2@2@2@2@2@2@2+2+2+2+V;W;X;Y;Z;1+1+1+1+4+4+4+4+4+4+4+,+,+,+,+,+>+>+'+'+'+'+'+'+'+T.T.T.T.T.T.T.3@3@3@3@3@%@+ + + + + +  +_$K.K.X.X.X.X.X.M.M.M.M.M.M.w.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.y.4@4@4@4@4@4@4@`;*#*#+# >i.i.1.1.|.|.|..>*#*#*#*#+>2.2.2.!.!.!.!.).o&*#*#@>~.~.~.~.Z Z Z Z Z Z Z 5@5@#>*#*#*#$>N N %>+#*#*#*#&>O P P P P P Q Q Q Q Q Q Q x *>*#*#*#*#=>y y y y y y z z z z z z z 6@6@6@6@6@6@->*#*#;>j j j j K+K+3 3 3 3 3 4 4 4 4 4 4 4 M+M+M+`.+ + + + + + +                 ",
-"              + + + + + + e-9*9*/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+h+h+h+h+>>,>'>)>!>~>{>]>^>/>(>_>:><>*#*#*#*#[>}>1+1+1+4+4+4+4+4+4+4+,+,+,+,+,+>+>+'+'+'+'+'+'+'+T.T.T.T.T.T.T.3@3@3@3@3@3@l.+ + + + + + 9-K.K.X.X.X.X.X.M.M.M.M.M.M.w.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.y.4@4@4@4@4@4@4@j$*#*#n&i.i.i.1.1.|.|.|.|>*#*#*#*#1>2.2.2.!.!.!.!.).2>*#*#.=~.~.~.~.Z Z Z Z Z Z Z 5@3>`@*#*#*#4>N N N 5>*#*#*#6>O P P P P P Q Q Q Q Q Q Q x  #*#*#*#7>w y y y y y y z z z z z z z 6@6@6@6@6@6@8>9>0>a>j j j j K+K+3 3 3 3 3 4 4 4 4 4 4 4 M+M+M+#@+ + + + + +                   ",
-"              + + + + + + b>9*9*/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ;c>d>e>f>g>h>i>j>k>l>m>+#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#n>1+1+1+4+4+4+4+4+4+4+,+,+,+,+,+>+>+'+'+'+'+'+'+'+T.T.T.T.T.T.T.3@3@3@3@3@3@x++ + + + + +  +X.K.X.X.X.X.X.M.M.M.M.M.M.w.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.y.4@4@4@4@4@4@4@o>*#*#*#p>i.i.1.1.|.|.|.q>*#*#*#*#r>2.2.2.!.!.!.!.).W-*#*#s>~.~.~.~.Z Z Z Z Z Z Z 5@t>*#*#*#y=f@N N N )=*#*#*#*#u>P P P P P Q Q Q Q Q Q Q v>+#*#*#*#w>w y y y y y y z z z z z z z 6@6@6@6@6@6@6@j j j j j j 2&x>y>3 3 3 3 3 4 4 4 4 4 4 4 M+M+M+ @+ + + + + +                   ",
-"              . + + + + + ^#9*9*/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ;z>*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#A>1+1+1+4+4+4+4+4+4+4+,+,+,+,+,+>+>+'+'+'+'+'+'+'+T.T.T.T.T.T.T.3@3@3@3@3@3@3@B>+ + + + + + C>K.X.X.X.X.X.M.M.M.M.M.M.w.w.w.w.w.Y.Y.v.v.v.v.v.v.v.y.y.y.y.y.y.y.4@4@D>E>F>G>H>I>*#*#*#J>i.i.1.1.|.|.|.K>*#*#*#*#L>2.2.2.!.!.!.!.).N#*#*#s%~.~.~.~.Z Z Z Z Z Z Z 5@M>*#*#*#N>5@N N N o;=**#*#*#O>P P P P P Q Q Q Q Q Q Q P>*#*#*#*#|*w y y y y y y z z z z z z Q>R>S>T>U>V>W>X>Y>Z>`> ,.,+,`@*#@,#,3 3 3 3 4 4 4 4 4 4 4 M+M+M+>@+ + + + + .                   ",
-"              + + + + + + O.1@9*/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ;$,*#*#*#*#*#*#*#*#*#*#*#*#*#%,&,*,=,-,;,>,,,',),!,~,{,9$*#*#*#],1+1+1+4+4+4+4+4+4+4+,+,+,+,+,+>+>+'+'+'+'+'+'+'+T.T.T.T.T.T.T.3@3@3@3@3@3@3@G-+ + + + + + ^,K.X.X.X.X.X./,(,M.M.M.M.w.w.w.w.w.Y.Y.v._,U&:,<,[,v.y.},|,1,2,3,4,5,6,*#*#*#*#*#7,*#*#*#8,i.i.1.1.|.|.|.9,0,*#*#*#a,2.2.2.!.!.!.!.).b,*#*#c,~.~.~.~.Z Z Z Z Z Z Z d,+#*#*#*#e,5@N N N N f,*#*#*#*#g,P P P P Q Q Q Q Q Q Q h,*#*#*#*#i,w y y y y y y z z z z z j,2%*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#k,3 3 3 3 4 4 4 4 4 4 4 M+M++@+ + + + + +                     ",
-"                + + + + + + l,9*/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ;m,n,o,p,q,r,s,t,*#*#*#*#u,v,h+2@2@2@2@2@2@2@2+2+2+2+2+w,*#*#*#x,1+1+1+4+4+4+4+4+4+4+,+,+,+,+,+>+>+'+'+'+'+'+'+'+T.T.T.T.T.T.T.3@3@3@3@3@3@3@W.B>+ y,&=z,A,B,C,D,E,F,X.G,H,I,J,M.K,V=L,m>M,5,N,O,#&-&*#*#*#*#P,v.y.Q,*#*#*#*#*#*#*#*#*#*#*#*#c;*#*#*#R,i.i.1.1.|.|.|.|.i$*#*#*#S,2.2.2.!.!.!.!.).T,A;9$U,~.~.~.~.Z Z Z Z Z Z Z V,*#*#*#o&W,5@N N N N X,i$*#*#*#Y,P P P P Q Q Q Q Q Q Q P>*#*#*#*#Z,w y y y y y y z z z z z `,*#*#*#*#*#*#*#*#*#*#*#*#*#0,U;A; '.'3 3 3 3 4 4 4 4 4 4 4 M+M+U++ + + + + +                     ",
-"                + + + + + + +'9*/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+@'#'*#*#*#$'h+h+2@2@2@2@2@2@2@2+2+2+2+2+%'*#*#*#&'1+1+1+4+4+4+4+4+4+4+,+,+,+,+,+>+>+'+'+'+'+'+'+'+T.T.T.T.T.T.T.3@3@3@3@3@3@3@W.*'-=*#*#*#*#*#*#*#*#U#='-'*#*#;'M.>'*#*#*#*#*#*#*#*#*#*#*#*#*#,'v.y.''f%)'n%N#*#*#*#*#!'~'{']'^'9$*#*#/'i.i.1.1.|.|.|.|.7,*#*#*#('2.2.2.!.!.!.!.).)._':'~.~.~.~.~.Z Z Z Z Z Z Z t%*#*#*#!*5@5@N N N N N D**#*#*#+#1#P P P Q Q Q Q Q Q Q v>+#*#*#*#9#w y y y y y y z z z z z <'&$v-7#['}'|'1'*#*#*#*#*#2')#j K+K+3 3 3 3 3 4 4 4 4 4 4 4 M+M+# + + + + + @                     ",
-"                @ + + + + + 3'9*/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+4'*#*#*#5'h+h+2@2@2@2@2@6'7'8'9'2+2+2+2+|=*#*#0'1+1+1+4+4+4+4+4+4+4+,+,+a'b'c'd'e'f'g'h'i'j'k''+T.T.T.T.T.T.T.3@3@3@3@3@3@l'm'*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#n'M.o'f%p'3,q'M#*#*#*#*#e&r's'M*t'v.y.y.y.y.y.u'*#*#*#5;v'4@4@4@i.w'!'x'(#i.i.1.1.|.|.|.|.y'*#*#*#m&2.2.2.!.!.!.!.).).~.~.~.~.~.~.~.Z Z Z Z Z Z z'*#*#*#*#A'5@5@N N N N N B'*#*#*#*#C'P P P Q Q Q Q Q Q Q x }**#*#*#2%D'y y y y y y z z z z z z z 6@6@6@6@6@6@E'*#*#*#*#F'j j K+K+3 3 3 3 3 4 4 4 4 4 4 4 M+A + + + + + + .                     ",
-"                + + + + + + + +-/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+G'*#*#*#H'h+h+2@2@2@2@2@I'*#*#J'2+2+2+2+e'*#*#K'1+1+1+4+4+4+4+4+4+L'M'N'*#*#*#*#*#*#*#*#*#*#*#O'P'T.T.T.T.T.T.3@3@3@3@3@Q'R'*#*#*#S'T'U'V'W'X'Y'Z'-&*#*#*#*#`'M.M.M.w.w.w. )o&*#*#*#4$v.v.v.v.v.y.y.y.y.y..)*#*#*#+)4@4@4@4@i.i.i.i.i.i.i.1.1.|.|.|.|.@)*#*#*#y'2.2.2.!.!.!.!.).).~.~.~.~.~.~.~.Z Z Z Z Z Z #)*#*#*#*#$)%)&)*)=)-);)>),)*#*#*#*#9$')P P Q Q Q Q Q Q Q x ))*#*#*#*#!)y y y y y y z z z z z z z 6@6@6@6@6@6@~)*#*#*#*#Q$j j K+K+3 3 3 3 3 4 4 4 4 4 4 4 M+O++ + + + + +                       ",
-"                  + + + + + + +'/;/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+e>*#*#*#{)h+h+2@2@2@2@2@])*#*#^)2+2+2+2+e'*#*#/)1+1+1+4+4+4+4+4+()_)*#*#*#*#*#:)M,M,:)*#*#*#*#*#<)T.T.T.T.T.T.3@3@3@3@3@[)*#*#*#})|)W.W.W.K.K.X.X.1)2)*#*#*#3)M.M.M.w.w.w.w.:$*#*#*#4)v.v.v.v.v.y.y.y.y.y.5)*#*#B$6)4@4@4@4@i.i.i.i.i.i.i.1.1.|.|.|.|.7)*#*#*#7,2.2.2.!.!.!.!.).).~.~.~.~.~.~.~.Z Z Z Z Z k=8)*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#9)P P Q Q Q Q Q Q Q x 3#*#*#*#*#0)y y y y y y z z z z z z z 6@6@6@6@6@6@a)*#*#*#*#b)j j K+K+3 3 3 3 3 4 4 4 4 4 4 4 M+% + + + + + +                       ",
-"                  . + + + + + O.Q&/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+c)*#*#*#d)h+h+2@2@2@2@2@e)*#*#f)2+2+2+2+g)*#*#h)1+1+1+4+4+4+4+i)#'*#*#*#j)k)l)>+>+'+'+m)n)*#*#*#*#o)T.T.T.T.T.3@3@3@3@p)q)*#*#2)r)W.W.W.W.K.K.X.X.X.s)9$*#*#t)M.M.M.w.w.w.w.u)2,*#*#*#v)v.v.v.v.y.y.y.y.w)`@*#*#x)4@4@4@4@4@i.i.i.i.i.i.i.1.1.|.|.|.|.y)*#*#*#y*2.2.2.!.!.!.!.).).~.~.~.~.~.~.~.Z Z Z Z Z z)*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#o@A)P Q Q Q Q Q Q Q x B)*#*#*#*#C)y y y y y y z z z z z z z 6@6@6@6@6@6@D)*#*#*#*#E)j j K+K+3 3 3 3 3 4 4 4 4 4 4 4 Y++ + + + + + +                       ",
-"                  + + + + + + + F)/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+G)*#*#*#H)h+h+2@2@2@2@2@I)*#*#J)2+2+2+2+K)*#*#L)1+1+1+4+4+4+4+M)*#*#*#N)O),+,+>+>+'+'+'+'+P)*#*#*#Q)T.T.T.T.T.3@3@3@3@R)*#*#*#S)W.W.W.W.W.K.K.X.X.X.X.T)*#*#U)M.M.M.w.w.w.w.w.V)*#*#*#W)v.v.v.v.y.y.y.y.X)*#*#*#Y)4@4@4@4@4@i.i.i.i.i.i.i.1.1.|.|.|.|.Z)*#*#*#`@`)2.2.!.!.!.!.).).~.~.~.~.~.~.~.Z Z Z Z Z !**#*#*#*#=$ !.!6#+!D$D*@!f,#!$!%!+#*#*#*#A$P Q Q Q Q Q Q Q x &!=$*#*#*#`@*!y y y y y z z z z z z z 6@6@6@6@6@6@l-*#*#*#*#Y-j j K+K+3 3 3 3 3 4 4 4 4 4 4 4 }@+ + + + + +                         ",
-"                    @ + + + + + ,@/;/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+=!*#*#*#j)h+h+2@2@2@2@2@-!*#*#{,2+2+2+2+8'*#*#;!1+1+1+4+4+4+>!*#*#*#*#,!,+,+,+>+>+'+'+'+'+'!*#*#*#)!T.T.T.T.T.3@3@3@3@!!*#*#*#~!W.W.W.W.W.K.K.X.X.X.X.{!*#*#]!M.M.M.w.w.w.w.w.^!/!*#*#*#(!v.v.v.y.y.y.y.A=*#*#_!:!4@4@4@4@4@i.i.i.i.i.i.i.1.1.|.|.|.|.h**#*#*#*#<!2.2.!.!.!.!.).).~.~.~.~.~.~.~.Z Z Z Z [!2$*#*#*#N>f@5@5@5@N N N N N N N O D$*#*#*#U#}!Q Q Q Q Q Q Q x x |!*#*#*#*#1!y y y y y z z z z z z z 6@6@6@6@6@6@2!*#*#*#*#3!j j K+K+3 3 3 3 3 4 4 4 4 4 4 4 ! + + + + + @                         ",
-"                    + + + + + + + 4!/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+5!*#*#*#6!7!h+2@2@2@2@8!9!*#*#{,2+2+2+2+0!a!b!c!1+1+1+4+4+4+d!*#*#*#*#*#e!,+,+>+>+'+'+'+'+f!+#*#*#`@g!T.T.T.T.3@3@3@3@h!`@*#*#M,i!W.W.W.W.K.K.X.X.X.X.j!*#b$k!M.M.M.w.w.w.w.w.Y.l!*#*#*#e&v.v.v.y.y.y.m!`@*#*#c$4@4@4@4@4@4@i.i.i.i.i.i.i.1.1.|.|.|.|.n!*#*#*#*#o!2.2.!.!.!.!.).).~.~.~.~.~.~.~.Z Z Z Z p!*#*#*#k-q!5@5@5@5@N N N N r!^-m s!t!9$*#*#*#u!Q Q Q Q Q Q Q x x P>M%*#*#*#9$v!y y y y z z z z z z z 6@6@6@6@6@w!*#*#*#*#*#`-j j K+K+3 3 3 3 3 4 4 4 4 4 4 `.~ + + + + + +                         ",
-"                      + + + + + + +'/;/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+x!*#*#*#*#y!z!A!B!C!D!#'*#*#*#E!2+2+2+2+3+3+3+1+1+1+1+4+4+4+F!G!*#*#*#*#H!,+,+>+>+'+'+'+'+I!*#*#*#*#J!T.T.T.T.3@3@3@3@3@K!*#*#*#O,L!M!W.W.K.K.X.X.X.X.N!O!P!M.M.M.M.w.w.w.w.w.Y.^!5$*#*#*#Q!v.v.y.y.y.u=*#*#*#R!4@4@4@4@4@4@i.i.i.i.i.i.i.1.1.|.|.|.|.%;*#*#*#*#S!2.2.!.!.!.!.).).~.~.~.~.~.~.~.Z Z Z Z T!*#*#*#U!5@5@5@5@5@N ^-m ~ + + + V!O W!*#*#*#8-X!Q Q Q Q Q Q x x x Y!*#*#*#*#U;Z!y y y z z z z z z z 6@6@6@6@`! ~*#*#*#*#*#.~j j K+K+3 3 3 3 3 4 4 4 4 4 4 ' + + + + + +                           ",
-"                      + + + + + + R +~/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+@~*#*#*#*#*#*#*#*#*#*#*#*#*#*##~2+2+2+2+3+3+3+1+1+1+1+4+4+4+4+$~S'*#*#9!%~,+,+>+>+'+'+&~*~_!*#*#*#*#=~T.T.T.T.3@3@3@3@3@-~n&*#*#*#*#*#b$;~O,5,I,>~,~'~)~!~M.M.M.M.M.w.w.w.w.w.Y.Y.~~*#*#*#{~v.v.y.y.y.+%*#*#]~^~4@4@4@4@4@4@i.i.i.i.i.i.i.1.1.|.|.|.|./~*#*#*#*#(~2.2.!.!.!.!.).).~.~.~.~.~.~.~.Z Z Z _~A@*#*#*#:~5@5@5@5@5@N k + + + + + <~O [~*#*#*#*#}~Q Q Q Q Q Q x x x |~w>*#*#*#*#1~2~y y z z z z z z z 6@6@6@3~I@*#*#*#H@*#*#4~j j K+K+3 3 3 3 3 4 4 4 4 4 4 5~+ + + + + +                           ",
-"                      + + + + + + + <@/;1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+6~*#*#*#*#*#7~8~9~_>0~a~*#*#*#b~2+2+2+2+3+3+3+1+1+1+1+4+4+4+4+4+c~d~e~f~,+,+,+>+>+g~M'h~*#*#*#*#*#*#i~T.T.T.T.3@3@3@3@3@3@j~@&*#*#*#*#*#*#*#*#*#*#*#*#*#U#k~l~M.M.M.w.w.w.w.w.Y.Y.m~n~*#*#*#o~v.y.y.p~o@*#*#q~4@4@4@4@4@4@4@i.i.i.i.i.i.i.1.1.|.|.|.|.r~*#*#*#*#s~2.2.!.!.!.!.).).~.~.~.~.~.~.~.Z Z Z t~*#*#*#*#u~5@5@5@5@5@N n + + + + + ~ P P v~*#*#*#-&X!Q Q Q Q Q x x x x w~9#*#*#*#*#`@x~3*z z z z z z z y~g@p#*#*#*#*#z~7-*#*#2%A~j K+K+3 3 3 3 3 4 4 4 4 4 4 :@+ + + + + +                           ",
-"                        + + + + + + !+B~1@1@1@1@1@1@1@m+m+m+m+m+ ; ;o+o+o+o+o+o+o+C~*#*#*#*#D~h+2@2@2@2@2@E~*#*#F~2+2+2+2+3+3+3+1+1+1+1+4+4+4+4+4+4+4+,+,+F!G~H~I~7~*#*#*#*#*#*#*#*#*#J~T.T.T.T.3@3@3@3@3@3@3@K~L~M~*#*#*#*#*#*#*#*#*#*#*#*#*#N~k!M.M.w.w.w.w.w.Y.Y.v.O~*#*#*#P~v.y.y.},*#*#*#Q~4@4@4@4@4@4@4@i.i.i.i.i.i.i.1.1.|.|.|.|.R~*#*#*#*#J;2.2.!.!.!.!.).).~.~.~.~.~.~.~.Z Z Z ('*#*#*#T#5@5@5@5@5@5@N S~+ + + + + + s!P T~*#*#*#*#g#z&Q Q Q Q x x x x w w~U~*#*#*#*#*#*#T%V~W~X~Y~Z~&#T-*#*#*#*#*#W~j .,*#*#*#`~j K+K+3 3 3 3 3 4 4 4 4 4  {+ + + + + + +                           ",
-"                        . + + + + + + 8@/#/#/#/#/#/#/#.{.{m+m+m+m+m+n+n+n+n+n+n+n++{*#*#*#*#@{h+#{#{#{#{#{${*#*#*#%{&{&{2+3+*{={-{;{3+3+B+B+B+B+B+B+>{,{'{U#*#*#*#*#*#*#*#n&){!{*#*#*#~{T.T.T.T.{{{{{{{{{{{{V.]{]{]{^{/{'~({_{:{<{[{}{*#*#*#*#*#|{M.M.w.w.w.w.w.w.w.x.b&1{*#*#+#2{y.y.3{*#*#<=4{5{5{5{5{5{5{5{6{i.i.i.i.i.i.1.1.1.1.1.1.7{*#*#*#*#8{2.2.!.!.!.!.!.!.;@;@;@;@~.~.~.Z Z 9{U#*#*#*#0{a{a{a{a{a{5@N L + + + + + + b{c{v~*#*#*#*#*#8)d{F*e{f{g{h{x x x x |~'$8-*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#H@i{6@j j{*#*#k{l{j K+K+K+K+K+3 3 4 4 4 4 4 m{+ + + + + +                             ",
-"                          + + + + + + G;/#/#/#/#/#/#/#.{.{m+m+m+m+m+n+n+n+n+n+n+n+n{*#*#*#*#o{h+#{#{#{#{#{#{_!*#*#p{&{&{2+3+q{*#*#r{3+3+B+B+B+B+s{t{U#*#*#*#*#*#*#*#9!u{v{w{C+x{*#*#*#y{T.T.T.T.{{{{{{{{z{A{n&B{]{]{W.W.W.W.K.M.F.o.B>C{D{*#*#*#*#E{M.w.w.w.w.w.w.w.x.x.F{*#*#*#G{y.B#B$*#*#H{y.5{5{5{5{5{5{5{6{i.i.i.i.i.i.1.1.1.1.1.1.I{*#*#*#*#J{2.2.!.!.!.!.!.!.;@;@;@;@~.~.~.Z K{L{*#*#*#*#M{N{O{P{Q{R{z$N N k + S{T{<%U{V{#'*#*#*#*#*#*#*#*#*#*#*#*#W{x x x x x I+X{w-5&*#*#*#*#*#*#*#*#*#*#Y{Z{`{ ]6@6@j /-.]d-S$j j K+K+K+K+K+3 3 4 4 4 4 4 = + + + + + +                             ",
-"                          + + + + + + + s+/#/#/#/#/#/#.{.{m+m+m+m+m+n+n+n+n+n+n+n+h++]*#*#*#@]h+#{#{#{#{#{#{g'*#*##]&{&{2+3+$]*#*#9$3+3+B+B+B+B+%]*#*#*#*#+]&]*]=]-]C+C+C+C+C+;]*#*#*#>]T.T.T.k),]~{{{{{']*#*#)]]{]{W.W.W.W.B>+ + + + + B.3,*#*#*#!]M.w.w.w.w.w.w.w.x.x.b&v=*#*#9$~]$%*#*#*#D#y.5{5{5{5{5{5{5{6{i.i.i.i.i.i.1.1.1.1.1.1..>*#*#*#*#1,{]2.!.!.]]%*^]!.;@;@;@/](]_]:]<][]*#*#*#*#*#*#*#*#*#*#*#+#}]N |]+ 1]*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#B$2]x x x x x I+y y y 3]4]5]J&|*z@9%6]7]8]9]0]0]6@6@6@j j j j j j j K+K+K+K+K+3 3 4 4 4 4 4 $ + + + + + @                             ",
-"                            + + + + + + ^#/#/#/#/#/#/#.{.{m+m+m+m+m+n+n+n+n+n+n+n+a]b]*#*#*#c]h+#{#{#{#{#{#{G!*#*#d]&{&{2+3+^)*#*#n&3+3+B+B+B+e]*#*#*#n&f]g],+,+,+,+C+C+C+C+C+i~*#*#*#h]T.T.&~_!*#i]{{{{j]*#*#k]]{]{W.W.W.W.A.+ + + + + 3.l]*#*#*#m]M.w.w.w.w.w.w.w.x.x.x.n]*#*#*#o]a&*#*#p]#%y.5{5{5{5{5{5{5{6{i.i.i.i.i.i.q]r]s]q]t]u]v=*#*#*#*#*#A;v]w].!-&*#M%x];@;@;@y]*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#z]N S~+ A]*#*#*#*#k-9#f{p;B]C]a#D]2#E]_*F]G]x x x x x x I+y y y y y z z z z z z z 0]0]0]0]6@6@6@j j j j j j j K+K+K+K+K+3 3 4 4 4 4 H]+ + + + + + +                             ",
-"                            @ + + + + + + I]/#/#/#/#/#.{.{m+m+m+m+m+n+n+n+n+n+n+n+a]J]*#*#*#K]h+#{#{#{#{#{#{L]*#g)M]&{&{2+3+N]*#*#M#3+3+B+B+B+O]*#*#*#P],+,+,+,+,+,+C+C+C+C+C+Q]*#*#*#R]T.T.T.o@*#+]{{{{S]*#*#n&T]]{W.W.W.W.U]+ + + + + + V]*#*#*#O=M.w.w.w.w.w.w.w.x.x.x.b&W]*#*#+#B$*#*#X]y.y.5{5{5{5{5{5{5{6{i.i.i.i.i.Y]]~*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#Z];@;@;@`]*#*#*#*#*#*#*#*#*#c# ^.^);T#+^@^#^X,N L + + $^&=v$%^&^O O O O Q Q Q Q Q Q Q x x x x x x x I+y y y y y z z z z z z z 0]0]0]0]6@6@6@j j j j j j j K+K+K+K+K+3 3 4 4 4 4 ' + + + + + +                               ",
-"                              + + + + + + *^/#/#/#/#/#.{.{m+m+m+m+m+n+n+n+n+n+n+n+a]=^*#*#*#-^h+#{#{#{#{#{#{;^>^,^&{&{&{2+3+'^*#*#:)3+3+B+B+B+)^*#*#6!O),+,+,+,+,+,+C+C+C+C+C+!^*#*#*#~^T.T.T.p'*#*#{^{{]^`@*#*#^^]{W.W.W.W.G.+ + + + + /^(^*#*#|=_^M.w.w.w.w.w.w.w.x.x.x.x.:^*#*#*#*#*#*#<^y.y.5{5{5{5{5{5{5{6{i.i.i.i.i.[^*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#U#T,;@;@;@}^S,|^1^2^3^Q{4^5^6^Z a{a{a{a{a{a{5@N N N ~ + + + + + o O O O O Q Q Q Q Q Q Q x x x x x x x I+y y y y y z z z z z z z 0]0]0]0]6@6@6@j j j j j j j K+K+K+K+K+3 3 4 4 4 4 ; + + + + + +                               ",
-"                              + + + + + + O.o+/#/#/#/#.{.{m+m+m+m+m+n+n+n+n+n+n+n+a]7^*#*#*#8^h+#{#{#{#{#{#{#{&{&{&{&{&{2+3+9^*#*#+]3+3+B+B+B+F~*#*#9!,+,+,+,+,+,+,+C+C+C+C+0^7~*#*#*#a^T.T.T.b^*#*#c^{{{{@&*#*#*#^^d^W.W.W.X.~ + + + e^f^*#*#*#g^M.M.w.w.w.w.w.w.w.x.x.x.x.h^X=*#*#*#*##&i^y.y.5{5{5{5{5{5{5{6{i.i.i.i.i.j^*#*#*#*#o&1=k^l^m^n^o^p^q^r^s^t^t^u^v^!.;@;@;@;@~.~.~.Z Z Z Z Z Z Z a{a{a{a{a{a{5@N N N 6 + + + + + m O O O O Q Q Q Q Q Q Q x x x x x x x I+y y y y y z z z z z z z 0]0]0]0]6@6@6@j j j j j j j K+K+K+K+K+3 3 4 4 4 4  @+ + + + + .                               ",
-"                              + + + + + + + w^/#/#/#/#/#.{m+m+m+m+m+m+n+n+n+n+n+n+n+x^*#*#*#y^h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+A^*#*#*#B^3+3+3+B+C^*#*#n&D^4+,+,+,+,+,+,+,+C+E^F^*#*#*#*#G^T.T.T.H^*#*#I^{{{{B$*#*#*#*#W=J^K^L^M^N^O^,&P^Q^*#*#*#R^S^M.M.M.M.M.w.w.w.w.w.w.w.x.x.T^*#*#*#*#U^y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.h.W^X^W^Y^1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^Z^Z^a{5@5@5@5@D + + + + + k N N O O P P P P P Q Q Q Q Q Q Q x x x w w w w y y y y y y y z `^`^`^`^ / /6@6@6@6@6@6@6@j j j j j j 2 3 3 3 3 3 $ + + + + + +                               ",
-"                                @ + + + + + 3'm+/#/#/#/#.{m+m+m+m+m+m+n+n+n+n+n+n+n+./*#*#*#+/h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+@/*#*#*#;{3+3+3+B+#/*#*#*#$/%/,+,+,+,+,+,+&/*/=/*#*#_!*#*#*#-/;/>/*#*#*#,/{{'/*#*#*#B$*#*#*#*#*#*#*#*#*#*#*#*#*#)/!/L.M.M.M.M.M.w.w.w.w.w.w.w.x.x.~/*#*#*#+#{/y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^Z^Z^a{5@5@5@5@^-+ + + + + + M N O O P P P P P Q Q Q Q Q Q Q x x x w w w w y y y y y y y z `^`^`^`^ / /6@6@6@6@6@6@6@j j j j j j 2 3 3 3 3 3 ~ + + + + + +                               ",
-"                                + + + + + + + Z+/#/#/#/#.{m+m+m+m+m+m+n+n+n+n+n+n+n+]/*#*#*#a~^/z^#{#{#{#{#{#{#{&{&{&{&{//(/:)*#*#*#~,3+3+3+B+i)+#*#*#*#_/:/</[/}/|/1/7~*#*#*#2/3/9$*#*#*#*#*#*#*#4/{{{{{^*#*#*#5/6/9$*#*#*#*#*#*#*#*#*#f^7/8/L.L.M.M.M.M.M.w.w.w.w.w.w.w.x.x.9/*#*#*#0/y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^Z^Z^a{5@5@5@5@a/+ + + + + + r!N O O P P P P P Q Q Q Q Q Q Q x x x w w w w y y y y y y y z `^`^`^`^ / /6@6@6@6@6@6@6@j j j j j j 2 3 3 3 3 b/+ + + + + +                                 ",
-"                                  + + + + + + ,@/#/#/#/#.{m+m+m+m+m+m+n+n+n+n+n+n+c/l>*#*#*#*#d/e/f/g/h/i/j/k/l/m/n/o/p/Y%*#*#*#*#*#q/3+3+3+B+B+r/*#*#*#*#*#*#*#*#*#*#*#*#*#s/t/C+u/*#*#*#*#*#*#N~v/{{{{{{w/*#x/y/]{z/A/B/C/D/E/F/G/H/I/+ + o.L.L.M.M.J/K/`@W&L/w.w.w.w.w.x.x.)'*#*#*#M*y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^Z^Z^a{5@5@5@5@W + + + + + + S~N O O P P P P P Q Q Q Q Q Q Q x x x w w w w y y y y y y y z `^`^`^`^ / /6@6@6@6@6@6@6@j j j j j j 2 3 3 3 3 m{+ + + + + +                                 ",
-"                                  + + + + + + + M//#/#/#.{m+m+m+m+m+m+N/O/P/Q/Q/R/S/*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#T/3+3+3+B+B+B+U/K)*#*#*#*#*#*#*#*#*#V/*/C+C+C+W/X/Y/Z/e%`/ (.(+({{{{{{@(#($({{]{W.W.W.W.W.W.4.+ + + + + ^,L.L.M.%(*#*#*#*#+%w.w.w.w.w.x.&(*#*#*#*(v.y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^Z^Z^a{5@5@5@5@5@~ + + + + + o N O O P P P P P Q Q Q Q Q Q Q x x x w w w w y y y y y y y z `^`^`^`^ / /6@6@6@6@6@6@6@j j j j j j 2 3 3 3 3 ; + + + + + +                                 ",
-"                                    + + + + + + Q+/#/#/#.{m+m+m+m+m+m+=(*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#-(;(3+3+3+B+B+B+B+>(,('()(!(~({(](^(t/C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.6.+ + + + + 4.L.L.M./(*#*#*#*#q'w.w.w.w.w.((+]*#*#-&_(v.y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^Z^Z^a{5@5@5@5@5@6 + + + + + m N O O P P P P P Q Q Q Q Q Q Q x x x w w w w y y y y y y y z `^`^`^`^ / /6@6@6@6@6@6@6@j j j j j j 2 3 3 3 3 - + + + + + @                                 ",
-"                                    @ + + + + + O.:(/#/#.{m+m+m+m+m+m+<(*#*#*#*#*#*#*#*#*#*#*#*#9$m>9![(9~}(|(1(2(3(4(5(6(7(8(9(0(a(3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.o.+ + + + + + M.L.M.b(*#*#*#1,c(w.w.w.w.d(6,*#*#`@e(v.v.y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^Z^Z^a{5@5@5@5@5@D + + + + + 5 N O O P P P P P Q Q Q Q Q Q Q x x x w w w w y y y y y y y z `^`^`^`^ / /6@6@6@6@6@6@6@j j j j j j 2 3 3 3 3 = + + + + + +                                 ",
-"                                      + + + + + + w^/#/#.{m+m+m+m+m+m+f(g(h(i(j(k(l(m(n(o('>p(q(z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.8/+ + + + + + H.L.M.r(*#*#*#O,s(t(u(v(W)*#*#*#+#~~v.v.v.y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^Z^Z^a{5@5@5@5@5@F + + + + + ~ N O O P P P P P Q Q Q Q Q Q Q x x x w w w w y y y y y y y z `^`^`^`^ / /6@6@6@6@6@6@6@j j j j j j 2 3 3 3 3 = + + + + + .                                 ",
-"                                      + + + + + + w(/#/#.{m+m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.H.+ + + + + + r.L.M.n'o&*#*#*#*#*#*#*#*#*#*#=$e(v.v.v.v.y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^Z^Z^a{5@5@5@5@5@x(+ + + + + + M O O P P P P P Q Q Q Q Q Q Q x x x w w w w y y y y y y y z `^`^`^`^ / /6@6@6@6@6@6@6@j j j j j j 2 3 3 3 3  @+ + + + + .                                 ",
-"                                      @ + + + + + + M//#.{m+m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.X.+ + + + + + 8.L.M.M. )4,*#*#*#*#*#*#*#y(3$z(x.v.v.v.v.y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^Z^Z^a{5@5@5@5@5@K=+ + + + + + L O O P P P P P Q Q Q Q Q Q Q x x x w w w w y y y y y y y z `^`^`^`^ / /6@6@6@6@6@6@6@j j j j j j A(b/) m{, % + + + + + +                                 ",
-"                                        + + + + + + Q+/#.{m+m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.K.4.+ + + + + B(L.M.M.M.M.C(D(E(F(G(H(I(J(x.x.x.v.v.v.v.y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^Z^Z^a{5@5@5@5@5@V + + + + + + r!O O P P P P P Q Q Q Q Q Q Q x x x w w w w y y y y y y y z `^`^`^ /K(L([ < : M(N(O(* & { $ # ~ + + + + + + + + + + + + +                                 ",
-"                                        @ + + + + + O.P(.{m+m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.K.B(+ + + + + 4.L.M.M.M.M.M.w.w.w.w.w.w.w.x.x.x.v.v.v.v.y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^Z^Z^a{5@5@5@5@5@W + + + + + + K=O O P P P P P Q Q Q Q Q Q Q x x w Q(d s r b a 9 R(8 7 S($ k ~ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +                                 ",
-"                                          + + + + + + V%.{m+m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.K.n.+ + + + + R L.M.M.M.M.M.w.w.w.w.w.w.w.x.x.x.v.v.v.v.y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^Z^Z^a{5@5@5@5@5@)*+ + + + + + x(P T(s!U(V(&^b{p o n m l 6 5 ~ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +                                 ",
-"                                          + + + + + + 8+.{m+m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.K.W(+ + + + + + M.M.M.M.M.M.w.w.w.w.w.w.w.x.x.x.v.v.v.v.y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.!.!.!.).~.~.~.~.~.~.~.Z Z Z^Z^Z^X(Y(W V a/S~x(^-E + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @                                 ",
-"                                          + + + + + + O.o+m+m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.K.8/+ + + + + + Z(M.M.M.M.M.w.w.w.w.w.w.w.x.x.x.v.v.v.v.y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.1.1.1.1.|.|.2.2.2.2.2.2.2.!.!.!.).'.~+;.@@N.T N+j.%.k+C .@5 k + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +                                 ",
-"                                            + + + + + + c+m+m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.K.G.+ + + + + + t.M.M.M.M.M.w.w.w.w.w.w.w.x.x.x.v.v.v.v.y.y.y.y.V^V^V^V^5{5{5{5{4@4@4@i.i.i.i.i.i.i.1.|.`( _<.._+_=.*.&.%.$.@_.@+.k ~ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +                                   ",
-"                                            @ + + + + + 9+m+m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.K.H-+ + + + + + 8/M.M.M.M.M.w.w.w.w.w.w.w.x.x.x.v.v.v.v.y.y.y.y.V^V^V^V^#_c.$_%_&_+_*_=_-_;_#.@.S R ~ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @ + + . + + . . +                                                           ",
-"                                            + + + + + + k.m+m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.K.J.+ + + + + + C>M.M.M.M.M.w.w.w.w.w.w.Z(>_,_b.'_p.9.)_^.B({.@_4.3.~ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @ @ @ @ + + + + +                                                                                           ",
-"                                            + + + + + + + s+m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{{{{{{{{{{{]{W.W.W.W.W.W.K.K.O.+ + + + + B(q.p.o.W%m.6.B>@.3.R + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @ . + + @ + + +                                                                                                                           ",
-"                                              + + + + + + 0+m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+C+C+C+C+C+C+'+T.T.T.T.T.+(+({{{{W.f-0&!_G.~_9-T$P+C.^,A.l.4.+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . + @ + + +                                                                                                                                                           ",
-"                                              + + + + + + ^#m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+3+3+B+B+B+B+B+4+4+,+,+,+,+,+,+,+T.S.q+V+&@x+$+`+5+++]+-@B>4.R ~ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @ + + + + + . +                                                                                                                                                                                           ",
-"                                              + + + + + + {+m+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{#{#{#{#{&{&{&{&{2+2+2+3+3+3+3+3+4+{_-+=+V+]_p+^_/_Q.C.-@R.!+ +~ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @ + . + + . + +                                                                                                                                                                                                                           ",
-"                                              + + + + + + ~ o+m+m+m+m+n+n+n+n+n+n+n+a]a]h+h+h+h+z^#{#{#{2@1+(___=+:_&+%+*^@+^+P..+l. +O.+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . + + . + + .                                                                                                                                                                                                                                                           ",
-"                                                + + + + + + A+m+m+m+m+n+n+g+f+e+<_[_}_|_1_2_Q+8+G;{+3'O.+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @ @ + + + + . . +                                                                                                                                                                                                                                                                                         ",
-"                                                + + + + + + 8+^#_@,@!+R + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @ @ + @ . + + +                                                                                                                                                                                                                                                                                                                         ",
-"                                                + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @ @ . . + + +                                                                                                                                                                                                                                                                                                                                                         ",
-"                                                + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @ . + + @ + + +                                                                                                                                                                                                                                                                                                                                                                                         ",
-"                                                + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . @ + + @ + +                                                                                                                                                                                                                                                                                                                                                                                                                         ",
-"                                                + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @ @ + + + + . +                                                                                                                                                                                                                                                                                                                                                                                                                                                         ",
-"                                                  + + + + + + + + + + + + + + + + + + + @ + @ @ @ + . +                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       ",
-"                                                  + + . @ + @ + . @ + +                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "};
+". 	c #FFD548",
+"+ 	c #FFD648",
+"@ 	c #FFD647",
+"# 	c #FFD649",
+"$ 	c #FFD748",
+"% 	c #FFD547",
+"& 	c #FFD749",
+"* 	c #FFD549",
+"= 	c #FFD446",
+"- 	c #FFD447",
+"; 	c #FFD747",
+"> 	c #FED648",
+", 	c #FED748",
+"' 	c #FED747",
+") 	c #FED847",
+"! 	c #FED947",
+"~ 	c #FDDB47",
+"{ 	c #FDDB46",
+"] 	c #FDDC46",
+"^ 	c #FDDA47",
+"/ 	c #FED649",
+"( 	c #FED848",
+"_ 	c #FDDC47",
+": 	c #FDDE46",
+"< 	c #FDE046",
+"[ 	c #FDE146",
+"} 	c #FDE346",
+"| 	c #FDE446",
+"1 	c #FDE645",
+"2 	c #FDE745",
+"3 	c #FDE744",
+"4 	c #FCE844",
+"5 	c #FDEA43",
+"6 	c #FDEB43",
+"7 	c #FDE544",
+"8 	c #FFD448",
+"9 	c #FFD847",
+"0 	c #FFD848",
+"a 	c #FED749",
+"b 	c #FDD849",
+"c 	c #FDDA48",
+"d 	c #FDDB48",
+"e 	c #FDDC48",
+"f 	c #FDDE48",
+"g 	c #FDDF47",
+"h 	c #FDE148",
+"i 	c #FDE247",
+"j 	c #FDE347",
+"k 	c #FCE547",
+"l 	c #FCE647",
+"m 	c #FCE747",
+"n 	c #FCE847",
+"o 	c #FCE947",
+"p 	c #FCEA46",
+"q 	c #FCEB46",
+"r 	c #FCEB45",
+"s 	c #FCEC46",
+"t 	c #FDEC45",
+"u 	c #FDEC44",
+"v 	c #FDEB44",
+"w 	c #FDEC43",
+"x 	c #FCEC43",
+"y 	c #FDEB42",
+"z 	c #FDE843",
+"A 	c #FDD747",
+"B 	c #FDD647",
+"C 	c #FED547",
+"D 	c #00D749",
+"E 	c #FFDA48",
+"F 	c #FFDB48",
+"G 	c #FFDA47",
+"H 	c #FED548",
+"I 	c #FED849",
+"J 	c #FDD949",
+"K 	c #FDDB49",
+"L 	c #FDDC49",
+"M 	c #FDDD49",
+"N 	c #FDDE49",
+"O 	c #FDE049",
+"P 	c #FDE149",
+"Q 	c #FDE249",
+"R 	c #FDE449",
+"S 	c #FCE549",
+"T 	c #FCE749",
+"U 	c #FCE849",
+"V 	c #FCE949",
+"W 	c #FCEA49",
+"X 	c #FBEB49",
+"Y 	c #FCEC48",
+"Z 	c #FCEC49",
+"` 	c #FCED48",
+" .	c #FCED47",
+"..	c #FCEE47",
+"+.	c #FCED46",
+"@.	c #FCED45",
+"#.	c #FDED45",
+"$.	c #FCEC45",
+"%.	c #FCEB44",
+"&.	c #FCEC44",
+"*.	c #FCEC42",
+"=.	c #FCEB42",
+"-.	c #FCE943",
+";.	c #FDD947",
+">.	c #FDD548",
+",.	c #FFD646",
+"'.	c #FEDA48",
+").	c #FDDA49",
+"!.	c #FDDC4A",
+"~.	c #FCDD4A",
+"{.	c #FDDE4A",
+"].	c #FCE04A",
+"^.	c #FCE24A",
+"/.	c #FCE34A",
+"(.	c #FDE44A",
+"_.	c #FCE64A",
+":.	c #FCE74A",
+"<.	c #FCE94A",
+"[.	c #FCEA4A",
+"}.	c #FCEB4A",
+"|.	c #FBED4A",
+"1.	c #FCEE4A",
+"2.	c #FCED4A",
+"3.	c #FCEE49",
+"4.	c #FCEF49",
+"5.	c #FBEE49",
+"6.	c #FCEE48",
+"7.	c #FBED46",
+"8.	c #FBEC46",
+"9.	c #FBED45",
+"0.	c #FCED44",
+"a.	c #FDEC42",
+"b.	c #FDEA42",
+"c.	c #FCDE4B",
+"d.	c #FCDF4A",
+"e.	c #F7DC49",
+"f.	c #E9C942",
+"g.	c #FDE349",
+"h.	c #FBEC4B",
+"i.	c #FBEE4D",
+"j.	c #FAEF4D",
+"k.	c #FBEF4D",
+"l.	c #FBEF4C",
+"m.	c #FBEE4C",
+"n.	c #FBF04C",
+"o.	c #FCF04B",
+"p.	c #FCF04C",
+"q.	c #FBEF4A",
+"r.	c #FCEF4B",
+"s.	c #FCEF4A",
+"t.	c #FBEF49",
+"u.	c #FBEE48",
+"v.	c #FBEE47",
+"w.	c #FBEE46",
+"x.	c #FCEE45",
+"y.	c #FDEE45",
+"z.	c #FDED44",
+"A.	c #FDED43",
+"B.	c #FDED42",
+"C.	c #FDE044",
+"D.	c #FDDA4A",
+"E.	c #FDDE4B",
+"F.	c #FCDF4C",
+"G.	c #FCE14C",
+"H.	c #FCE24D",
+"I.	c #FCE44D",
+"J.	c #FCE54D",
+"K.	c #FCE74D",
+"L.	c #FCE84E",
+"M.	c #FBEA4E",
+"N.	c #FBEB4F",
+"O.	c #FBED4F",
+"P.	c #FBEF4F",
+"Q.	c #FAF04F",
+"R.	c #FBF050",
+"S.	c #FBF150",
+"T.	c #FBF04F",
+"U.	c #EFE34A",
+"V.	c #D4B83B",
+"W.	c #FBD847",
+"X.	c #FFDC48",
+"Y.	c #FDE549",
+"Z.	c #FBF14D",
+"`.	c #FAF14D",
+" +	c #FBF04D",
+".+	c #FBF04B",
+"++	c #FBEF4B",
+"@+	c #FCEF48",
+"#+	c #FCEF47",
+"$+	c #FCEE46",
+"%+	c #FCEE44",
+"&+	c #FDE543",
+"*+	c #FFD949",
+"=+	c #FFD948",
+"-+	c #FDDC4B",
+";+	c #FCDE4C",
+">+	c #FCE14E",
+",+	c #FCE34F",
+"'+	c #FCE54F",
+")+	c #FCE64F",
+"!+	c #FCE750",
+"~+	c #FCE951",
+"{+	c #FCEA50",
+"]+	c #FBEC51",
+"^+	c #FBED51",
+"/+	c #FBEF52",
+"(+	c #FBF052",
+"_+	c #FAF152",
+":+	c #FBF152",
+"<+	c #FBF252",
+"[+	c #FBF251",
+"}+	c #FBF151",
+"|+	c #FBF250",
+"1+	c #FAF250",
+"2+	c #FBF14F",
+"3+	c #F4E94D",
+"4+	c #D2B83B",
+"5+	c #F5D345",
+"6+	c #FAF04D",
+"7+	c #FAF04C",
+"8+	c #FCF04A",
+"9+	c #FCF049",
+"0+	c #FCF048",
+"a+	c #FBEE45",
+"b+	c #FCE942",
+"c+	c #FFD546",
+"d+	c #FED74A",
+"e+	c #FED84A",
+"f+	c #FDD94A",
+"g+	c #FDDA4B",
+"h+	c #FCE04E",
+"i+	c #FCE151",
+"j+	c #FCE453",
+"k+	c #FCE655",
+"l+	c #FCE756",
+"m+	c #FBE957",
+"n+	c #FBEB59",
+"o+	c #FBEC5A",
+"p+	c #FAEE5C",
+"q+	c #FAF05D",
+"r+	c #FAF15D",
+"s+	c #FAF25E",
+"t+	c #F9F25E",
+"u+	c #FAF35E",
+"v+	c #FAF45D",
+"w+	c #FAF35B",
+"x+	c #FAF359",
+"y+	c #FAF357",
+"z+	c #FAF356",
+"A+	c #FAF355",
+"B+	c #FAF353",
+"C+	c #FBF353",
+"D+	c #FBF253",
+"E+	c #FBF352",
+"F+	c #FBF351",
+"G+	c #FAF251",
+"H+	c #FAF14F",
+"I+	c #F6EC4C",
+"J+	c #D3BC3B",
+"K+	c #F0CF43",
+"L+	c #FEE349",
+"M+	c #FBF14E",
+"N+	c #FAF14E",
+"O+	c #FBF14C",
+"P+	c #FCF14C",
+"Q+	c #FCEE4B",
+"R+	c #FDEB41",
+"S+	c #FDDE45",
+"T+	c #FDDB4C",
+"U+	c #FCDD4F",
+"V+	c #FCE152",
+"W+	c #FCE256",
+"X+	c #FCE459",
+"Y+	c #FCE75C",
+"Z+	c #FCE85E",
+"`+	c #FBEA60",
+" @	c #FBEC63",
+".@	c #FBEE66",
+"+@	c #FAEF68",
+"@@	c #FAF16A",
+"#@	c #FAF36B",
+"$@	c #FBF46D",
+"%@	c #FAF46E",
+"&@	c #FBF56F",
+"*@	c #FBF570",
+"=@	c #FBF56D",
+"-@	c #FAF56B",
+";@	c #FAF56A",
+">@	c #FAF669",
+",@	c #FAF667",
+"'@	c #FAF666",
+")@	c #FAF565",
+"!@	c #FAF564",
+"~@	c #FAF562",
+"{@	c #FAF563",
+"]@	c #F9F460",
+"^@	c #FAF55F",
+"/@	c #FAF55E",
+"(@	c #FAF45C",
+"_@	c #FAF45A",
+":@	c #FAF459",
+"<@	c #FAF458",
+"[@	c #FAF457",
+"}@	c #FAF253",
+"|@	c #FAF352",
+"1@	c #FAF351",
+"2@	c #FAF252",
+"3@	c #F8ED4D",
+"4@	c #D9C23E",
+"5@	c #EBCA42",
+"6@	c #FFDC49",
+"7@	c #FEE149",
+"8@	c #FBF24E",
+"9@	c #FBF04E",
+"0@	c #FCF14B",
+"a@	c #FCEF46",
+"b@	c #FDEC41",
+"c@	c #FDEA41",
+"d@	c #FDE344",
+"e@	c #FDDB4B",
+"f@	c #FDDC4E",
+"g@	c #FCDF52",
+"h@	c #FCE157",
+"i@	c #FBE35B",
+"j@	c #FBE560",
+"k@	c #FBE864",
+"l@	c #FBE966",
+"m@	c #FCE061",
+"n@	c #F2D55F",
+"o@	c #FEE066",
+"p@	c #FFE169",
+"q@	c #FFE26C",
+"r@	c #FEE66F",
+"s@	c #FBF57B",
+"t@	c #FBF67E",
+"u@	c #FBF680",
+"v@	c #FBF681",
+"w@	c #FBF781",
+"x@	c #FBF780",
+"y@	c #FBF77E",
+"z@	c #FBF77C",
+"A@	c #FBF77B",
+"B@	c #FBF87A",
+"C@	c #FBF879",
+"D@	c #FBF877",
+"E@	c #FBF777",
+"F@	c #FBF775",
+"G@	c #FBF774",
+"H@	c #FAF673",
+"I@	c #FBF672",
+"J@	c #FBF670",
+"K@	c #FBF66E",
+"L@	c #FBF66D",
+"M@	c #FBF66C",
+"N@	c #FAF66B",
+"O@	c #F9F564",
+"P@	c #F9F563",
+"Q@	c #F9F562",
+"R@	c #F9F560",
+"S@	c #F9F55F",
+"T@	c #F9F55E",
+"U@	c #F9F45D",
+"V@	c #F9F45C",
+"W@	c #F9F45A",
+"X@	c #F9F459",
+"Y@	c #F9F457",
+"Z@	c #F9F354",
+"`@	c #F9F355",
+" #	c #FBF453",
+".#	c #FBF452",
+"+#	c #FBF350",
+"@#	c #FBF24F",
+"##	c #F8ED4C",
+"$#	c #DEC740",
+"%#	c #E5C840",
+"&#	c #FEDE49",
+"*#	c #FCE842",
+"=#	c #FED647",
+"-#	c #FDD84A",
+";#	c #FDDA4C",
+">#	c #FDDC53",
+",#	c #FCDF58",
+"'#	c #FCE25E",
+")#	c #FBE562",
+"!#	c #FBE668",
+"~#	c #FBE96D",
+"{#	c #FCEB72",
+"]#	c #FCED75",
+"^#	c #FCEF7A",
+"/#	c #FBF07F",
+"(#	c #FBF283",
+"_#	c #FAF586",
+":#	c #FAF68A",
+"<#	c #FBF78D",
+"[#	c #FBF891",
+"}#	c #FAF893",
+"|#	c #FBF894",
+"1#	c #FBF993",
+"2#	c #FBF991",
+"3#	c #FBF990",
+"4#	c #FBF98F",
+"5#	c #FBF68D",
+"6#	c #F6E47F",
+"7#	c #D4C165",
+"8#	c #F8DF79",
+"9#	c #FFE57B",
+"0#	c #FFE57A",
+"a#	c #FEE87B",
+"b#	c #FAF884",
+"c#	c #FAF985",
+"d#	c #FBF883",
+"e#	c #FBF881",
+"f#	c #FBF880",
+"g#	c #FBF87F",
+"h#	c #FBF87D",
+"i#	c #FBF87B",
+"j#	c #FBF878",
+"k#	c #FAF777",
+"l#	c #FAF776",
+"m#	c #FAF775",
+"n#	c #FAF671",
+"o#	c #FAF66F",
+"p#	c #FAF66D",
+"q#	c #F9F666",
+"r#	c #F9F665",
+"s#	c #FAF561",
+"t#	c #F9F561",
+"u#	c #FAF45E",
+"v#	c #FAF55C",
+"w#	c #FAF55B",
+"x#	c #FAF55A",
+"y#	c #FAF559",
+"z#	c #FAF558",
+"A#	c #FAF456",
+"B#	c #FAF455",
+"C#	c #FAF454",
+"D#	c #FBF354",
+"E#	c #FBF34F",
+"F#	c #F9EE4D",
+"G#	c #E2CC42",
+"H#	c #E0C841",
+"I#	c #FFDD48",
+"J#	c #FDE942",
+"K#	c #FDDB50",
+"L#	c #FDDE58",
+"M#	c #FCE05F",
+"N#	c #FCE466",
+"O#	c #FBE66B",
+"P#	c #FCE871",
+"Q#	c #FCEB78",
+"R#	c #FCED7D",
+"S#	c #FCEF82",
+"T#	c #FCF088",
+"U#	c #FBF28D",
+"V#	c #FBF492",
+"W#	c #FBF696",
+"X#	c #FBF79B",
+"Y#	c #FBF8A0",
+"Z#	c #FBF9A3",
+"`#	c #FBFAA5",
+" $	c #FBFAA4",
+".$	c #FBFBA2",
+"+$	c #FBFBA1",
+"@$	c #FBFAA1",
+"#$	c #FBFAA0",
+"$$	c #FBFA9F",
+"%$	c #FBFA9D",
+"&$	c #FBFA9B",
+"*$	c #FBFA9A",
+"=$	c #FBFA98",
+"-$	c #FBFA97",
+";$	c #FBFA96",
+">$	c #FAFA95",
+",$	c #FBFA94",
+"'$	c #FBFA93",
+")$	c #FBF992",
+"!$	c #FBF98E",
+"~$	c #FBF78C",
+"{$	c #F8E981",
+"]$	c #D3C061",
+"^$	c #F3DA75",
+"/$	c #FEE77A",
+"($	c #FAF784",
+"_$	c #FAF883",
+":$	c #FAF882",
+"<$	c #FAF881",
+"[$	c #FAF880",
+"}$	c #FAF87F",
+"|$	c #FAF87D",
+"1$	c #FAF87B",
+"2$	c #FAF87A",
+"3$	c #FAF879",
+"4$	c #FAF878",
+"5$	c #FBF776",
+"6$	c #FBF674",
+"7$	c #FAF773",
+"8$	c #FBF671",
+"9$	c #FBF66F",
+"0$	c #FBF76E",
+"a$	c #FBF76D",
+"b$	c #FAF76C",
+"c$	c #FAF76A",
+"d$	c #FAF769",
+"e$	c #FAF768",
+"f$	c #FAF767",
+"g$	c #FAF665",
+"h$	c #FAF663",
+"i$	c #FAF662",
+"j$	c #FAF560",
+"k$	c #FAF55D",
+"l$	c #FAEF4E",
+"m$	c #E7D444",
+"n$	c #DAC440",
+"o$	c #FFDB49",
+"p$	c #FCEC4C",
+"q$	c #FEDA5A",
+"r$	c #FDEB91",
+"s$	c #FCF49C",
+"t$	c #FBF6A2",
+"u$	c #FBF8A7",
+"v$	c #FBF9AD",
+"w$	c #FBFAB2",
+"x$	c #FBFBB6",
+"y$	c #FBFBB5",
+"z$	c #FBFBB3",
+"A$	c #FBFCB2",
+"B$	c #FCFCB1",
+"C$	c #FCFCB0",
+"D$	c #FBFBAF",
+"E$	c #FBFBAE",
+"F$	c #FBFBAD",
+"G$	c #FBFBAC",
+"H$	c #FBFBAB",
+"I$	c #FBFBAA",
+"J$	c #FBFBA9",
+"K$	c #FBFBA8",
+"L$	c #FBFBA7",
+"M$	c #FBFBA6",
+"N$	c #FBFBA5",
+"O$	c #FBFBA4",
+"P$	c #FBFBA3",
+"Q$	c #FBFBA0",
+"R$	c #FAFA99",
+"S$	c #FAFA98",
+"T$	c #FAFA96",
+"U$	c #FAFA93",
+"V$	c #FAF991",
+"W$	c #FAF990",
+"X$	c #FAF98E",
+"Y$	c #FAF88C",
+"Z$	c #F9EB81",
+"`$	c #D5C360",
+" %	c #F0D872",
+".%	c #FFE479",
+"+%	c #FFE579",
+"@%	c #FAF684",
+"#%	c #FAF984",
+"$%	c #FBF983",
+"%%	c #FBF982",
+"&%	c #FBF981",
+"*%	c #FBF87C",
+"=%	c #FBF876",
+"-%	c #FBF772",
+";%	c #FAF766",
+">%	c #FAF461",
+",%	c #FAF354",
+"'%	c #FBF254",
+")%	c #FBEF4E",
+"!%	c #ECDC45",
+"~%	c #D4BF3E",
+"{%	c #FDE94B",
+"]%	c #FBF24D",
+"^%	c #FEE074",
+"/%	c #FDF4B7",
+"(%	c #FBFCBB",
+"_%	c #FBFCBA",
+":%	c #FBFCB9",
+"<%	c #FBFCB8",
+"[%	c #FBFCB7",
+"}%	c #FBFCB6",
+"|%	c #FBFCB4",
+"1%	c #FBFCB3",
+"2%	c #FBFCAF",
+"3%	c #FBFCAE",
+"4%	c #FAFBA1",
+"5%	c #FAFBA0",
+"6%	c #FAFA9F",
+"7%	c #FAFA9E",
+"8%	c #FAFA9D",
+"9%	c #FAFA9C",
+"0%	c #FAFA9A",
+"a%	c #FBFA91",
+"b%	c #FBFA90",
+"c%	c #FBFA8F",
+"d%	c #F9EE82",
+"e%	c #D7C660",
+"f%	c #EDD56F",
+"g%	c #FEE47A",
+"h%	c #FFE679",
+"i%	c #FBF582",
+"j%	c #FAF983",
+"k%	c #FBF87E",
+"l%	c #FBF773",
+"m%	c #F9F453",
+"n%	c #F1E449",
+"o%	c #D2BE3F",
+"p%	c #FAD746",
+"q%	c #FDE64A",
+"r%	c #FDE244",
+"s%	c #FDE486",
+"t%	c #FDF4B6",
+"u%	c #FBFCB5",
+"v%	c #FBFCB1",
+"w%	c #FBFCB0",
+"x%	c #FBFCA2",
+"y%	c #FBFCA1",
+"z%	c #FBFB9F",
+"A%	c #FBFB9D",
+"B%	c #FBFB9A",
+"C%	c #FBFB99",
+"D%	c #FBFB97",
+"E%	c #FBFB96",
+"F%	c #FBFB95",
+"G%	c #FBFB94",
+"H%	c #FBFB93",
+"I%	c #FBFA92",
+"J%	c #FBFA8E",
+"K%	c #FAF98C",
+"L%	c #F9EF83",
+"M%	c #DBC763",
+"N%	c #E9D469",
+"O%	c #FEE378",
+"P%	c #FFE478",
+"Q%	c #FFE678",
+"R%	c #FBF47F",
+"S%	c #FAF982",
+"T%	c #FBF980",
+"U%	c #FBF875",
+"V%	c #FAF661",
+"W%	c #FAF557",
+"X%	c #FAF453",
+"Y%	c #F5EB4A",
+"Z%	c #D1BD3E",
+"`%	c #F3D345",
+" &	c #FEE34A",
+".&	c #FDE842",
+"+&	c #FDD946",
+"@&	c #FEE798",
+"#&	c #FCF5B7",
+"$&	c #FAFCB9",
+"%&	c #FBFDB4",
+"&&	c #FBFDB3",
+"*&	c #FBFDB1",
+"=&	c #FCFDB1",
+"-&	c #FBFCAD",
+";&	c #FBFCAB",
+">&	c #FBFCA7",
+",&	c #FBFCA6",
+"'&	c #FBFCA5",
+")&	c #FBFCA4",
+"!&	c #FBFCA3",
+"~&	c #FBFCA0",
+"{&	c #FBFB9C",
+"]&	c #FBFB98",
+"^&	c #FAF98D",
+"/&	c #F9F384",
+"(&	c #DFCB68",
+"_&	c #E6D362",
+":&	c #FDE276",
+"<&	c #FFE577",
+"[&	c #FCF17F",
+"}&	c #FBF882",
+"|&	c #FBF97F",
+"1&	c #FBF770",
+"2&	c #FAF76B",
+"3&	c #FAF664",
+"4&	c #F7EC4C",
+"5&	c #D6C13E",
+"6&	c #EBD044",
+"7&	c #FEDA47",
+"8&	c #FEE049",
+"9&	c #FCEA42",
+"0&	c #FEECAA",
+"a&	c #FBFDBA",
+"b&	c #FAFDB9",
+"c&	c #FBFDB9",
+"d&	c #FBFDB7",
+"e&	c #FBFDB2",
+"f&	c #FBFCAC",
+"g&	c #FBFB9B",
+"h&	c #FAF88D",
+"i&	c #F9F687",
+"j&	c #E3CE6B",
+"k&	c #E1D25C",
+"l&	c #FFE477",
+"m&	c #FCEE7C",
+"n&	c #FAF765",
+"o&	c #FAF556",
+"p&	c #F9EF4D",
+"q&	c #DEC940",
+"r&	c #E3CD44",
+"s&	c #FFDD49",
+"t&	c #FDEC40",
+"u&	c #FDE642",
+"v&	c #FED853",
+"w&	c #FEEDB2",
+"x&	c #FCF8B8",
+"y&	c #FBFDB8",
+"z&	c #FBFB9E",
+"A&	c #FAFA8B",
+"B&	c #F9F787",
+"C&	c #E7D36D",
+"D&	c #DDCF57",
+"E&	c #FFE476",
+"F&	c #FFE576",
+"G&	c #FDEA79",
+"H&	c #FBF77D",
+"I&	c #FBF771",
+"J&	c #FAF660",
+"K&	c #FAF45F",
+"L&	c #FAF04E",
+"M&	c #E4D143",
+"N&	c #DCC741",
+"O&	c #FCEC4D",
+"P&	c #FCE941",
+"Q&	c #FDDD45",
+"R&	c #FEDB65",
+"S&	c #FEEEB1",
+"T&	c #FCF9B9",
+"U&	c #FBFCAA",
+"V&	c #FBFB92",
+"W&	c #FAF888",
+"X&	c #EBDA72",
+"Y&	c #D6C954",
+"Z&	c #FDE274",
+"`&	c #FFE475",
+" *	c #FEE877",
+".*	c #FBF76C",
+"+*	c #FAF555",
+"@*	c #EBDC46",
+"#*	c #D6C23F",
+"$*	c #FCD946",
+"%*	c #FDE74C",
+"&*	c #FDE443",
+"**	c #FEE076",
+"=*	c #FBFBBA",
+"-*	c #FBFA8D",
+";*	c #FAF98B",
+">*	c #FAFA8A",
+",*	c #FAF987",
+"'*	c #F1E377",
+")*	c #D3C454",
+"!*	c #FBE274",
+"~*	c #FFE474",
+"{*	c #FCF67E",
+"]*	c #FBF874",
+"^*	c #FAF554",
+"/*	c #D2BE3D",
+"(*	c #F9D745",
+"_*	c #FEE44A",
+":*	c #FDEB40",
+"<*	c #FDEA40",
+"[*	c #FDDA46",
+"}*	c #FEE489",
+"|*	c #FDF0B3",
+"1*	c #FBFCA9",
+"2*	c #FBFC9F",
+"3*	c #FBFA99",
+"4*	c #FBFB91",
+"5*	c #FAFA8D",
+"6*	c #FAFA89",
+"7*	c #F7EE7D",
+"8*	c #D2C257",
+"9*	c #F3DC6C",
+"0*	c #FEE374",
+"a*	c #FFE574",
+"b*	c #FCF27C",
+"c*	c #FBF97E",
+"d*	c #FBF76F",
+"e*	c #FAF763",
+"f*	c #F6EB4B",
+"g*	c #D2BF3E",
+"h*	c #F1D346",
+"i*	c #FEDF4A",
+"j*	c #FEE89A",
+"k*	c #FDF2B4",
+"l*	c #FAFDB8",
+"m*	c #FBFDB6",
+"n*	c #FAF98A",
+"o*	c #FAFA88",
+"p*	c #F9F17F",
+"q*	c #D9C75E",
+"r*	c #EAD763",
+"s*	c #FDE373",
+"t*	c #FFE374",
+"u*	c #FFE473",
+"v*	c #FCEF79",
+"w*	c #FBF873",
+"x*	c #FAF66C",
+"y*	c #FAF762",
+"z*	c #FAF65A",
+"A*	c #FAF657",
+"B*	c #F8EE4C",
+"C*	c #DBC840",
+"D*	c #E8CE44",
+"E*	c #FCEC4A",
+"F*	c #FDE742",
+"G*	c #FDD847",
+"H*	c #FEECAB",
+"I*	c #FCF5B5",
+"J*	c #FAFA87",
+"K*	c #F9F582",
+"L*	c #E0CA64",
+"M*	c #E5D35B",
+"N*	c #FDE372",
+"O*	c #FFE373",
+"P*	c #FFE472",
+"Q*	c #FDEC77",
+"R*	c #FAF65C",
+"S*	c #FAF656",
+"T*	c #E4D543",
+"U*	c #DCC540",
+"V*	c #FDE74A",
+"W*	c #FFD956",
+"X*	c #FEEDB0",
+"Y*	c #FCF8B7",
+"Z*	c #FAFA8C",
+"`*	c #F9F783",
+" =	c #E5D16A",
+".=	c #DDCE57",
+"+=	c #FDE271",
+"@=	c #FFE371",
+"#=	c #FEE773",
+"$=	c #FAF658",
+"%=	c #F0E348",
+"&=	c #D5BC3D",
+"*=	c #F9D646",
+"==	c #FDE34A",
+"-=	c #FFDE69",
+";=	c #FEEEAF",
+">=	c #FBFBB8",
+",=	c #FBFCA8",
+"'=	c #FAFA86",
+")=	c #ECDB70",
+"!=	c #D6C855",
+"~=	c #FDE272",
+"{=	c #FFE372",
+"]=	c #FCF57B",
+"^=	c #FAF65D",
+"/=	c #D7BE3D",
+"(=	c #EFCE44",
+"_=	c #FDDB45",
+":=	c #FDE17A",
+"<=	c #FDF1B2",
+"[=	c #FBFC9E",
+"}=	c #FBFB90",
+"|=	c #F2E675",
+"1=	c #D2C153",
+"2=	c #F9DE6F",
+"3=	c #FFE370",
+"4=	c #FFE470",
+"5=	c #FCF179",
+"6=	c #FBF872",
+"7=	c #FAF668",
+"8=	c #F2DB47",
+"9=	c #FADC49",
+"0=	c #FDE44B",
+"a=	c #FDE94C",
+"b=	c #FDEC3F",
+"c=	c #FDE243",
+"d=	c #FDE58C",
+"e=	c #FCF5B4",
+"f=	c #FBFDB5",
+"g=	c #FAFCB0",
+"h=	c #FAF88A",
+"i=	c #FAF989",
+"j=	c #FAFA85",
+"k=	c #F8F27D",
+"l=	c #D6C459",
+"m=	c #EDD566",
+"n=	c #FEE270",
+"o=	c #FFE36F",
+"p=	c #FDED76",
+"q=	c #FBF77A",
+"r=	c #FBF14B",
+"s=	c #FDE740",
+"t=	c #FDEA9D",
+"u=	c #FCF9B6",
+"v=	c #FBFA9C",
+"w=	c #FBF997",
+"x=	c #F8F780",
+"y=	c #E0CD63",
+"z=	c #E2CE5D",
+"A=	c #FDE16F",
+"B=	c #FEE972",
+"C=	c #FBF679",
+"D=	c #FCE940",
+"E=	c #FDE043",
+"F=	c #FFD74B",
+"G=	c #FDEFAE",
+"H=	c #FBFC9D",
+"I=	c #F9F781",
+"J=	c #E9D86B",
+"K=	c #D8C459",
+"L=	c #FCE16E",
+"M=	c #FFE26F",
+"N=	c #FFE26E",
+"O=	c #FEE46F",
+"P=	c #FCF578",
+"Q=	c #FDEB3F",
+"R=	c #FDEA3F",
+"S=	c #FDE93F",
+"T=	c #FDE640",
+"U=	c #FDDA5A",
+"V=	c #FDF3B2",
+"W=	c #FAF981",
+"X=	c #F3E774",
+"Y=	c #D4C05A",
+"Z=	c #F7DB6C",
+"`=	c #FFE46F",
+" -	c #FEE670",
+".-	c #FCF375",
+"+-	c #FAF659",
+"@-	c #FDE940",
+"#-	c #FDDE44",
+"$-	c #FDDE6C",
+"%-	c #FCF7B5",
+"&-	c #FBFB8F",
+"*-	c #F9F27B",
+"=-	c #DFCC63",
+"--	c #F2E06F",
+";-	c #FCF077",
+">-	c #FCF478",
+",-	c #FBF871",
+"'-	c #F1E647",
+")-	c #FDE442",
+"!-	c #FDE47E",
+"~-	c #FBFAB7",
+"{-	c #FAFCAE",
+"]-	c #FAF889",
+"^-	c #FAF988",
+"/-	c #FAF97F",
+"(-	c #F9F57C",
+"_-	c #D1C63E",
+":-	c #A29A30",
+"<-	c #6F6921",
+"[-	c #6C6720",
+"}-	c #E9DE44",
+"|-	c #E9D93D",
+"1-	c #F3E33E",
+"2-	c #FCE840",
+"3-	c #FDD649",
+"4-	c #FDEB93",
+"5-	c #FBFBB7",
+"6-	c #FBF996",
+"7-	c #FBF779",
+"8-	c #FBF778",
+"9-	c #FBF870",
+"0-	c #FAF65E",
+"a-	c #F0E447",
+"b-	c #6A641F",
+"c-	c #4A4616",
+"d-	c #484515",
+"e-	c #5D581B",
+"f-	c #E1D742",
+"g-	c #EFE040",
+"h-	c #D6C83A",
+"i-	c #C3B635",
+"j-	c #E5D73E",
+"k-	c #BFB333",
+"l-	c #8F8626",
+"m-	c #A69B2B",
+"n-	c #F4E541",
+"o-	c #FAEA42",
+"p-	c #B1A52E",
+"q-	c #6F671D",
+"r-	c #5E5819",
+"s-	c #625C1A",
+"t-	c #7B7220",
+"u-	c #D6C638",
+"v-	c #FDE143",
+"w-	c #FDD749",
+"x-	c #FCF3A6",
+"y-	c #FBFDB0",
+"z-	c #FBFC9C",
+"A-	c #FAFA8E",
+"B-	c #FAF980",
+"C-	c #FAF75E",
+"D-	c #F2E94E",
+"E-	c #EDE64D",
+"F-	c #FBEE4B",
+"G-	c #CBC03C",
+"H-	c #847E27",
+"I-	c #5C581B",
+"J-	c #D8CE40",
+"K-	c #F9EC47",
+"L-	c #E4D840",
+"M-	c #CCC039",
+"N-	c #EBDE41",
+"O-	c #F8EA45",
+"P-	c #BCB133",
+"Q-	c #898226",
+"R-	c #716A1F",
+"S-	c #837B24",
+"T-	c #AEA32F",
+"U-	c #F4E443",
+"V-	c #7E7622",
+"W-	c #605A1A",
+"X-	c #5B5519",
+"Y-	c #5A5418",
+"Z-	c #7B7321",
+"`-	c #524D16",
+" ;	c #484413",
+".;	c #BEB232",
+"+;	c #958B27",
+"@;	c #514C15",
+"#;	c #5B5518",
+"$;	c #8A8124",
+"%;	c #766E1F",
+"&;	c #4C4714",
+"*;	c #625B1A",
+"=;	c #DECF39",
+"-;	c #FDE840",
+";;	c #FDD846",
+">;	c #FDD94E",
+",;	c #FCF8B4",
+"';	c #FBFB8E",
+");	c #FAFA84",
+"!;	c #F9F97F",
+"~;	c #FAF97D",
+"{;	c #FAF75D",
+"];	c #FAF759",
+"^;	c #CCC543",
+"/;	c #958F31",
+"(;	c #646120",
+"_;	c #5F5C1F",
+":;	c #736F25",
+"<;	c #979231",
+"[;	c #D4CD44",
+"};	c #BCB337",
+"|;	c #4E4A17",
+"1;	c #5A561A",
+"2;	c #D1C73D",
+"3;	c #E4D942",
+"4;	c #CBBF3A",
+"5;	c #B0A632",
+"6;	c #9C942D",
+"7;	c #C5BB38",
+"8;	c #8A8328",
+"9;	c #67611D",
+"0;	c #6C661E",
+"a;	c #98902B",
+"b;	c #E2D740",
+"c;	c #827B25",
+"d;	c #5B561A",
+"e;	c #534E17",
+"f;	c #605B1B",
+"g;	c #9F962C",
+"h;	c #F2E543",
+"i;	c #847D25",
+"j;	c #514D16",
+"k;	c #5B5619",
+"l;	c #6D671E",
+"m;	c #4D4815",
+"n;	c #746D20",
+"o;	c #E8D93E",
+"p;	c #9E942A",
+"q;	c #726A1E",
+"r;	c #4A4514",
+"s;	c #4E4915",
+"t;	c #555017",
+"u;	c #746D1E",
+"v;	c #67611B",
+"w;	c #B9AD31",
+"x;	c #5C5618",
+"y;	c #575117",
+"z;	c #A89C2C",
+"A;	c #D4C637",
+"B;	c #BFB332",
+"C;	c #665F1B",
+"D;	c #494413",
+"E;	c #9D9228",
+"F;	c #FCE93F",
+"G;	c #FDDF43",
+"H;	c #FBFC9B",
+"I;	c #FBFA95",
+"J;	c #F4EF54",
+"K;	c #C2BE43",
+"L;	c #B9B63F",
+"M;	c #B1AE3C",
+"N;	c #A5A138",
+"O;	c #989534",
+"P;	c #ADA93B",
+"Q;	c #999533",
+"R;	c #89862E",
+"S;	c #7E7B2A",
+"T;	c #767328",
+"U;	c #6D6A25",
+"V;	c #666322",
+"W;	c #6A6723",
+"X;	c #737026",
+"Y;	c #7B7829",
+"Z;	c #A39F36",
+"`;	c #E6E04C",
+" >	c #B1AC3A",
+".>	c #57541C",
+"+>	c #58541C",
+"@>	c #787426",
+"#>	c #757126",
+"$>	c #5A571D",
+"%>	c #484617",
+"&>	c #D1CA43",
+"*>	c #EFE648",
+"=>	c #D7CD40",
+"->	c #EEE347",
+";>	c #CFC53D",
+">>	c #918A2B",
+",>	c #797224",
+"'>	c #A39B31",
+")>	c #A79F31",
+"!>	c #57531A",
+"~>	c #565219",
+"{>	c #CAC03B",
+"]>	c #F0E446",
+"^>	c #6C661F",
+"/>	c #534E18",
+"(>	c #4B4715",
+"_>	c #5E591B",
+":>	c #5F5A1B",
+"<>	c #4E4A16",
+"[>	c #534F17",
+"}>	c #635E1C",
+"|>	c #878026",
+"1>	c #6B651E",
+"2>	c #484414",
+"3>	c #615B1B",
+"4>	c #E9DB40",
+"5>	c #B3A932",
+"6>	c #595418",
+"7>	c #CCC038",
+"8>	c #CDC138",
+"9>	c #4C4815",
+"0>	c #908726",
+"a>	c #D1C338",
+"b>	c #A1972B",
+"c>	c #F9E942",
+"d>	c #F1E240",
+"e>	c #EEDF3F",
+"f>	c #4F4A15",
+"g>	c #585217",
+"h>	c #565017",
+"i>	c #6C651C",
+"j>	c #EDDD3D",
+"k>	c #FDEA3E",
+"l>	c #FDE541",
+"m>	c #FCEB7A",
+"n>	c #FAFCAD",
+"o>	c #FAF887",
+"p>	c #FAF97E",
+"q>	c #FAF75C",
+"r>	c #FAF758",
+"s>	c #F0EB53",
+"t>	c #6A6824",
+"u>	c #4D4C1A",
+"v>	c #494719",
+"w>	c #484618",
+"x>	c #59571E",
+"y>	c #969333",
+"z>	c #6E6B25",
+"A>	c #54521C",
+"B>	c #494718",
+"C>	c #5A571E",
+"D>	c #706D26",
+"E>	c #716E25",
+"F>	c #626021",
+"G>	c #56531C",
+"H>	c #4C4A19",
+"I>	c #615F20",
+"J>	c #A6A237",
+"K>	c #EFE84E",
+"L>	c #615E20",
+"M>	c #4B4818",
+"N>	c #A59F35",
+"O>	c #B5AF3A",
+"P>	c #53501B",
+"Q>	c #8C872D",
+"R>	c #F6ED4D",
+"S>	c #D6CE43",
+"T>	c #AEA837",
+"U>	c #A59F33",
+"V>	c #C3BC3D",
+"W>	c #DED644",
+"X>	c #D0C740",
+"Y>	c #AEA735",
+"Z>	c #88822A",
+"`>	c #6E6922",
+" ,	c #ABA435",
+".,	c #89832A",
+"+,	c #5F5B1D",
+"@,	c #565019",
+"#,	c #61561C",
+"$,	c #837826",
+"%,	c #F6EA4A",
+"&,	c #B4AB36",
+"*,	c #5B571B",
+"=,	c #625D1D",
+"-,	c #645F1E",
+";,	c #514D17",
+">,	c #C0B738",
+",,	c #F9EC48",
+"',	c #BEB437",
+"),	c #7E7724",
+"!,	c #484415",
+"~,	c #7F7924",
+"{,	c #DDD23F",
+"],	c #E0D540",
+"^,	c #625D1C",
+"/,	c #DDD13E",
+"(,	c #C5BA37",
+"_,	c #555018",
+":,	c #514C17",
+"<,	c #C0B435",
+"[,	c #655F1C",
+"},	c #F8EB44",
+"|,	c #6F681E",
+"1,	c #EADB3F",
+"2,	c #DECF3C",
+"3,	c #5D5719",
+"4,	c #4A4614",
+"5,	c #B7AB30",
+"6,	c #887F24",
+"7,	c #A59A2B",
+"8,	c #BBAE30",
+"9,	c #C2B533",
+"0,	c #CBBD35",
+"a,	c #D3C436",
+"b,	c #DBCD37",
+"c,	c #F4E43F",
+"d,	c #FCE83F",
+"e,	c #FDDA45",
+"f,	c #FBF396",
+"g,	c #FBF995",
+"h,	c #FAF87E",
+"i,	c #FAF75A",
+"j,	c #F9F456",
+"k,	c #DCD74B",
+"l,	c #8B882F",
+"m,	c #4F4E1B",
+"n,	c #F7F053",
+"o,	c #9A9634",
+"p,	c #514F1B",
+"q,	c #BBB43F",
+"r,	c #FAF254",
+"s,	c #F5EE51",
+"t,	c #C8C242",
+"u,	c #676422",
+"v,	c #59561D",
+"w,	c #BEB83E",
+"x,	c #DCD548",
+"y,	c #5D5A1E",
+"z,	c #484517",
+"A,	c #918B2F",
+"B,	c #D9D246",
+"C,	c #5C591E",
+"D,	c #4C4918",
+"E,	c #9D9832",
+"F,	c #DED645",
+"G,	c #747025",
+"H,	c #5B571D",
+"I,	c #5B571C",
+"J,	c #56531A",
+"K,	c #514E19",
+"L,	c #605D1E",
+"M,	c #BCB53A",
+"N,	c #54501A",
+"O,	c #494616",
+"P,	c #66611F",
+"Q,	c #5D571C",
+"R,	c #7F7124",
+"S,	c #7F6E24",
+"T,	c #544818",
+"U,	c #554B18",
+"V,	c #BFB539",
+"W,	c #E2D743",
+"X,	c #605B1D",
+"Y,	c #4C4816",
+"Z,	c #8E872A",
+"`,	c #EEE147",
+" '	c #F5E848",
+".'	c #B5AC34",
+"+'	c #58541A",
+"@'	c #B8AF36",
+"#'	c #C0B537",
+"$'	c #D1C63C",
+"%'	c #797222",
+"&'	c #DBCF3E",
+"*'	c #5D571A",
+"='	c #4B4615",
+"-'	c #B7AC33",
+";'	c #EEE142",
+">'	c #7E7722",
+",'	c #A59A2D",
+"''	c #494514",
+")'	c #585318",
+"!'	c #CDC037",
+"~'	c #E6D73E",
+"{'	c #AA9F2D",
+"]'	c #998F28",
+"^'	c #565016",
+"/'	c #C9BC35",
+"('	c #FBE940",
+"_'	c #F5E53F",
+":'	c #FDEB3E",
+"<'	c #FDE93E",
+"['	c #FBF9AE",
+"}'	c #BDB940",
+"|'	c #504F1B",
+"1'	c #53521C",
+"2'	c #C4C043",
+"3'	c #BEBA40",
+"4'	c #504E1B",
+"5'	c #52501C",
+"6'	c #C8C143",
+"7'	c #DED84A",
+"8'	c #5F5D20",
+"9'	c #E6DF4B",
+"0'	c #948F30",
+"a'	c #6E6A24",
+"b'	c #CCC442",
+"c'	c #DAD346",
+"d'	c #928D2F",
+"e'	c #DCD546",
+"f'	c #777325",
+"g'	c #494617",
+"h'	c #827D29",
+"i'	c #DCD444",
+"j'	c #D2CA41",
+"k'	c #696621",
+"l'	c #484516",
+"m'	c #6C6822",
+"n'	c #E5DC46",
+"o'	c #BDB53A",
+"p'	c #484416",
+"q'	c #60561B",
+"r'	c #CAAF39",
+"s'	c #F6D345",
+"t'	c #66581D",
+"u'	c #493F15",
+"v'	c #7F7425",
+"w'	c #4B4816",
+"x'	c #D7CC40",
+"y'	c #E5DA43",
+"z'	c #5E591C",
+"A'	c #AEA633",
+"B'	c #CCBF3A",
+"C'	c #565119",
+"D'	c #575219",
+"E'	c #CABF3A",
+"F'	c #847E25",
+"G'	c #FBED47",
+"H'	c #E4D83F",
+"I'	c #5F591A",
+"J'	c #ACA230",
+"K'	c #ECDF42",
+"L'	c #7B7422",
+"M'	c #B4A831",
+"N'	c #EFDE40",
+"O'	c #9C9229",
+"P'	c #C4B834",
+"Q'	c #555016",
+"R'	c #B3A72E",
+"S'	c #6F681D",
+"T'	c #D0C236",
+"U'	c #FDE441",
+"V'	c #FFD746",
+"W'	c #FCE260",
+"X'	c #FAF986",
+"Y'	c #F9F97E",
+"Z'	c #FAF87C",
+"`'	c #C9C544",
+" )	c #57561D",
+".)	c #BEBA41",
+"+)	c #C8C343",
+"@)	c #55531D",
+"#)	c #4F4C1A",
+"$)	c #BFB940",
+"%)	c #969131",
+"&)	c #54511B",
+"*)	c #C0BA3F",
+"=)	c #ABA537",
+"-)	c #6B6823",
+";)	c #686522",
+">)	c #989331",
+",)	c #F9F14F",
+"')	c #EDE44B",
+"))	c #706C23",
+"!)	c #524F1A",
+"~)	c #B1AB38",
+"{)	c #9D9831",
+"])	c #5F5C1E",
+"^)	c #EBE249",
+"/)	c #ECE348",
+"()	c #5E5A1D",
+"_)	c #8A8027",
+":)	c #E1C23E",
+"<)	c #FCD847",
+"[)	c #766521",
+"})	c #746521",
+"|)	c #8C862A",
+"1)	c #E9DD45",
+"2)	c #ECE145",
+"3)	c #5F5A1C",
+"4)	c #A0982F",
+"5)	c #D3C83C",
+"6)	c #5A551A",
+"7)	c #C2B837",
+"8)	c #8F8828",
+"9)	c #625C1C",
+"0)	c #F3E644",
+"a)	c #EDE042",
+"b)	c #605A1B",
+"c)	c #9E952C",
+"d)	c #726B20",
+"e)	c #605B1A",
+"f)	c #E7DA3F",
+"g)	c #8F8627",
+"h)	c #DFD03B",
+"i)	c #F4E442",
+"j)	c #F7E741",
+"k)	c #7C7420",
+"l)	c #A1962A",
+"m)	c #AEA12D",
+"n)	c #5E5818",
+"o)	c #887F23",
+"p)	c #F8E740",
+"q)	c #FCE73F",
+"r)	c #FBED7D",
+"s)	c #D2CE47",
+"t)	c #5A581F",
+"u)	c #4A4819",
+"v)	c #B5B23E",
+"w)	c #D0CB46",
+"x)	c #B6B03D",
+"y)	c #BFBA3F",
+"z)	c #514E1A",
+"A)	c #959030",
+"B)	c #ACA637",
+"C)	c #6F6C24",
+"D)	c #706D24",
+"E)	c #5E5B1E",
+"F)	c #504D1A",
+"G)	c #5B581D",
+"H)	c #999430",
+"I)	c #F6EE4E",
+"J)	c #E6DE48",
+"K)	c #B8B13A",
+"L)	c #C9C23F",
+"M)	c #A19C32",
+"N)	c #7A7626",
+"O)	c #615E1E",
+"P)	c #5E5B1D",
+"Q)	c #E3DA47",
+"R)	c #F5EB4B",
+"S)	c #615D1E",
+"T)	c #888129",
+"U)	c #F5D344",
+"V)	c #816F25",
+"W)	c #6B5C1E",
+"X)	c #FDE849",
+"Y)	c #5D581C",
+"Z)	c #E1D643",
+"`)	c #F4E848",
+" !	c #615C1C",
+".!	c #938C2B",
+"+!	c #DDD13F",
+"@!	c #B9AF35",
+"#!	c #9C942C",
+"$!	c #ECDF43",
+"%!	c #F5E744",
+"&!	c #625C1B",
+"*!	c #8C8527",
+"=!	c #B1A731",
+"-!	c #AFA52F",
+";!	c #FBEC44",
+">!	c #E5D73F",
+",!	c #6A631D",
+"'!	c #494513",
+")!	c #8A8125",
+"!!	c #EADA3F",
+"~!	c #B6A931",
+"{!	c #5A5518",
+"]!	c #9A9029",
+"^!	c #E2D43C",
+"/!	c #E3D43B",
+"(!	c #7E7621",
+"_!	c #534E16",
+":!	c #4A4513",
+"<!	c #534D16",
+"[!	c #78701F",
+"}!	c #FDE83F",
+"|!	c #FDDC44",
+"1!	c #FBF698",
+"2!	c #FAFCAC",
+"3!	c #FBFAA2",
+"4!	c #FBF156",
+"5!	c #FDE64F",
+"6!	c #FDE44D",
+"7!	c #DAD54A",
+"8!	c #5C5A1F",
+"9!	c #A9A539",
+"0!	c #D8D348",
+"a!	c #A8A338",
+"b!	c #CEC844",
+"c!	c #84802B",
+"d!	c #FAF151",
+"e!	c #E8E14B",
+"f!	c #88842C",
+"g!	c #494717",
+"h!	c #BFB93D",
+"i!	c #E0D847",
+"j!	c #8A852B",
+"k!	c #59551C",
+"l!	c #53501A",
+"m!	c #625F1F",
+"n!	c #7A7625",
+"o!	c #5D591D",
+"p!	c #DAD143",
+"q!	c #66621F",
+"r!	c #817B27",
+"s!	c #DCCA3F",
+"t!	c #E1C640",
+"u!	c #8E7A28",
+"v!	c #65571D",
+"w!	c #FBDD49",
+"x!	c #CABE3B",
+"y!	c #534F19",
+"z!	c #BEB438",
+"A!	c #F9ED49",
+"B!	c #65601D",
+"C!	c #878128",
+"D!	c #9B932C",
+"E!	c #5A5519",
+"F!	c #B7AD34",
+"G!	c #BAAF34",
+"H!	c #5D581A",
+"I!	c #A2992D",
+"J!	c #E0D43D",
+"K!	c #8A8325",
+"L!	c #544F17",
+"M!	c #67611C",
+"N!	c #766F20",
+"O!	c #C4B735",
+"P!	c #615B1A",
+"Q!	c #69631C",
+"R!	c #CFC237",
+"S!	c #F9E841",
+"T!	c #C7BA33",
+"U!	c #B3A72F",
+"V!	c #ADA02D",
+"W!	c #D6C737",
+"X!	c #F9E83F",
+"Y!	c #FDE042",
+"Z!	c #FCDB4C",
+"`!	c #FBFBB0",
+" ~	c #F9EF54",
+".~	c #FDE54F",
+"+~	c #FCED53",
+"@~	c #E2DE4D",
+"#~	c #5E5C20",
+"$~	c #9B9735",
+"%~	c #E1DB4B",
+"&~	c #5D5B1F",
+"*~	c #484518",
+"=~	c #9C9734",
+"-~	c #C1BC40",
+";~	c #524F1B",
+">~	c #9F9A34",
+",~	c #CEC643",
+"'~	c #C3BB3F",
+")~	c #F5EC4F",
+"!~	c #CEC742",
+"~~	c #88832B",
+"{~	c #847F2A",
+"]~	c #64611F",
+"^~	c #C6BF3D",
+"/~	c #EFE74A",
+"(~	c #BFB83B",
+"_~	c #D1C840",
+":~	c #787325",
+"<~	c #ECE047",
+"[~	c #D3BF3D",
+"}~	c #F6D445",
+"|~	c #99832B",
+"1~	c #61531B",
+"2~	c #F2D145",
+"3~	c #F7E248",
+"4~	c #6B651F",
+"5~	c #766F23",
+"6~	c #E0D542",
+"7~	c #99922D",
+"8~	c #514D18",
+"9~	c #6A651F",
+"0~	c #D7CD3E",
+"a~	c #F9ED48",
+"b~	c #CEC23B",
+"c~	c #837C26",
+"d~	c #504C17",
+"e~	c #585319",
+"f~	c #7C7523",
+"g~	c #494515",
+"h~	c #787122",
+"i~	c #585218",
+"j~	c #5E581A",
+"k~	c #5F5A1A",
+"l~	c #FAEC44",
+"m~	c #C7BC36",
+"n~	c #8E8527",
+"o~	c #797221",
+"p~	c #887F25",
+"q~	c #B8AC31",
+"r~	c #F3E441",
+"s~	c #EDDD40",
+"t~	c #DBCD3B",
+"u~	c #E3D53D",
+"v~	c #EADB3E",
+"w~	c #F3E440",
+"x~	c #FAEA41",
+"y~	c #FBE764",
+"z~	c #F7EB55",
+"A~	c #D9BF3E",
+"B~	c #F4D346",
+"C~	c #FEE34C",
+"D~	c #EAE650",
+"E~	c #8E8B30",
+"F~	c #E7E34D",
+"G~	c #5E5B20",
+"H~	c #8F8B2F",
+"I~	c #989332",
+"J~	c #BAB43D",
+"K~	c #D1CA44",
+"L~	c #5E5A1F",
+"M~	c #BDB73D",
+"N~	c #BFB93E",
+"O~	c #55521B",
+"P~	c #948E2F",
+"Q~	c #E3DB48",
+"R~	c #F1E94B",
+"S~	c #8B862B",
+"T~	c #4E4B18",
+"U~	c #524E19",
+"V~	c #B6AF38",
+"W~	c #CBC33E",
+"X~	c #F3E84B",
+"Y~	c #6A6521",
+"Z~	c #64601F",
+"`~	c #D9CF41",
+" {	c #D1C03C",
+".{	c #C2AC38",
+"+{	c #796822",
+"@{	c #564A18",
+"#{	c #98832B",
+"${	c #CFB43A",
+"%{	c #B2A734",
+"&{	c #5C571B",
+"*{	c #66611E",
+"={	c #4A4716",
+"-{	c #4D4917",
+";{	c #68631E",
+">{	c #E7DB43",
+",{	c #AFA532",
+"'{	c #655F1D",
+"){	c #6D671F",
+"!{	c #767022",
+"~{	c #928B29",
+"{{	c #9E962C",
+"]{	c #A49C2E",
+"^{	c #BBB035",
+"/{	c #C2B737",
+"({	c #D5C93A",
+"_{	c #DDD03D",
+":{	c #E5D940",
+"<{	c #F6E844",
+"[{	c #FBF181",
+"}{	c #F9F97C",
+"|{	c #FAF65B",
+"1{	c #F8F256",
+"2{	c #E0C641",
+"3{	c #E2C33E",
+"4{	c #FFDD4A",
+"5{	c #FCEC52",
+"6{	c #F3EE52",
+"7{	c #827F2C",
+"8{	c #F1EB51",
+"9{	c #605D20",
+"0{	c #837F2B",
+"a{	c #DAD348",
+"b{	c #5F5D1F",
+"c{	c #6D6A24",
+"d{	c #F0E94E",
+"e{	c #C3BD40",
+"f{	c #55521C",
+"g{	c #494618",
+"h{	c #A5A035",
+"i{	c #E9E24B",
+"j{	c #86822B",
+"k{	c #59561C",
+"l{	c #C5BE3E",
+"m{	c #F7EE4E",
+"n{	c #797526",
+"o{	c #57541B",
+"p{	c #666320",
+"q{	c #635F1E",
+"r{	c #706B22",
+"s{	c #514D19",
+"t{	c #4B4817",
+"u{	c #5D591C",
+"v{	c #A59D31",
+"w{	c #5A521A",
+"x{	c #544817",
+"y{	c #5C4F1A",
+"z{	c #5D501B",
+"A{	c #5E511B",
+"B{	c #FEE549",
+"C{	c #CFC23C",
+"D{	c #8C852A",
+"E{	c #736D22",
+"F{	c #C5BB3A",
+"G{	c #B6AD35",
+"H{	c #BEB538",
+"I{	c #C7BD3A",
+"J{	c #F1E546",
+"K{	c #F9EB46",
+"L{	c #FBF89B",
+"M{	c #FAF97C",
+"N{	c #FAF86E",
+"O{	c #FAF75B",
+"P{	c #F1E14D",
+"Q{	c #D4B93B",
+"R{	c #FEE14C",
+"S{	c #F7F254",
+"T{	c #615F21",
+"U{	c #726F26",
+"V{	c #615E21",
+"W{	c #6E6B24",
+"X{	c #F6EF51",
+"Y{	c #E4DE4C",
+"Z{	c #BBB63E",
+"`{	c #C8C140",
+" ]	c #605D1F",
+".]	c #4D4A18",
+"+]	c #58551C",
+"@]	c #D5CD43",
+"#]	c #726E23",
+"$]	c #CAC33F",
+"%]	c #C8C03E",
+"&]	c #827D28",
+"*]	c #7E7927",
+"=]	c #938C2D",
+"-]	c #9F9931",
+";]	c #ADA634",
+">]	c #B8B037",
+",]	c #B1A433",
+"']	c #BCA836",
+")]	c #DBBC3E",
+"!]	c #E5C541",
+"~]	c #EECC43",
+"{]	c #F7D446",
+"]]	c #FDEB49",
+"^]	c #FEDA45",
+"/]	c #FCDF51",
+"(]	c #FAFCAB",
+"_]	c #FAF885",
+":]	c #FAF97B",
+"<]	c #FAF86A",
+"[]	c #F9F156",
+"}]	c #DFC53F",
+"|]	c #E1C33F",
+"1]	c #FFDC4A",
+"2]	c #F6F154",
+"3]	c #CFCB46",
+"4]	c #5D5B20",
+"5]	c #5A581E",
+"6]	c #B2AE3C",
+"7]	c #D4CF47",
+"8]	c #AEA93A",
+"9]	c #58551D",
+"0]	c #54511C",
+"a]	c #636121",
+"b]	c #696623",
+"c]	c #5D5A1F",
+"d]	c #504E1A",
+"e]	c #514E1B",
+"f]	c #CEC743",
+"g]	c #EAE24C",
+"h]	c #9C9632",
+"i]	c #827E29",
+"j]	c #EAE249",
+"k]	c #E3DB47",
+"l]	c #F1E748",
+"m]	c #D3C13C",
+"n]	c #F1D142",
+"o]	c #FEE249",
+"p]	c #FEE93F",
+"q]	c #FEDC44",
+"r]	c #FBEA69",
+"s]	c #F9F765",
+"t]	c #F0E04D",
+"u]	c #D4BC3D",
+"v]	c #F3D143",
+"w]	c #FEE24C",
+"x]	c #CAC645",
+"y]	c #57551E",
+"z]	c #A09C36",
+"A]	c #5B571E",
+"B]	c #646221",
+"C]	c #6F6C25",
+"D]	c #88842D",
+"E]	c #A9A538",
+"F]	c #F2EA4F",
+"G]	c #F3EB4E",
+"H]	c #E6DF4A",
+"I]	c #E1DA49",
+"J]	c #F5ED4F",
+"K]	c #FAEF4A",
+"L]	c #E2D242",
+"M]	c #DCC43E",
+"N]	c #FCD947",
+"O]	c #FDED4E",
+"P]	c #FDEE57",
+"Q]	c #FDEF5E",
+"R]	c #FDF067",
+"S]	c #FDF071",
+"T]	c #FDF17A",
+"U]	c #FDF284",
+"V]	c #FDF38D",
+"W]	c #FDF28F",
+"X]	c #FDF391",
+"Y]	c #FDF393",
+"Z]	c #FDF495",
+"`]	c #FDF497",
+" ^	c #FDF499",
+".^	c #FDF283",
+"+^	c #FDEF72",
+"@^	c #FEED62",
+"#^	c #FEE053",
+"$^	c #FAF480",
+"%^	c #FAF97A",
+"&^	c #F9F862",
+"*^	c #F9F75B",
+"=^	c #F9F256",
+"-^	c #DFC23E",
+";^	c #FCEA51",
+">^	c #B8B53F",
+",^	c #C0BC41",
+"'^	c #C9C444",
+")^	c #D2CD46",
+"!^	c #DBD549",
+"~^	c #DED94A",
+"{^	c #D9D349",
+"]^	c #E2DB4C",
+"^^	c #EAE44D",
+"/^	c #F3EC4F",
+"(^	c #F6EB49",
+"_^	c #D5C13E",
+":^	c #ECCC43",
+"<^	c #FEDF48",
+"[^	c #FDEC4F",
+"}^	c #FDEE5C",
+"|^	c #FDF068",
+"1^	c #FDF175",
+"2^	c #FDF38F",
+"3^	c #FDF490",
+"4^	c #FDF392",
+"5^	c #FDF394",
+"6^	c #FDF395",
+"7^	c #FDF396",
+"8^	c #FDF397",
+"9^	c #FDF398",
+"0^	c #FDF49A",
+"a^	c #FDF49C",
+"b^	c #FDF49E",
+"c^	c #FEF59F",
+"d^	c #FEF4A0",
+"e^	c #FEF4A1",
+"f^	c #FEE987",
+"g^	c #FDD94B",
+"h^	c #FAF976",
+"i^	c #F9F85F",
+"j^	c #F8F85B",
+"k^	c #F9F75A",
+"l^	c #F1E24E",
+"m^	c #D4BC3C",
+"n^	c #EFCE42",
+"o^	c #FEDE4A",
+"p^	c #FBF155",
+"q^	c #E6D842",
+"r^	c #D6BF3D",
+"s^	c #F8D546",
+"t^	c #FDE748",
+"u^	c #FAEA43",
+"v^	c #DDCF3B",
+"w^	c #D0C336",
+"x^	c #E0D23B",
+"y^	c #F2E340",
+"z^	c #FDEE4F",
+"A^	c #FDEF5F",
+"B^	c #FDF06F",
+"C^	c #FDF27C",
+"D^	c #F7ED85",
+"E^	c #D6CD7E",
+"F^	c #CEC67E",
+"G^	c #EEE487",
+"H^	c #FDF38C",
+"I^	c #FDF38E",
+"J^	c #FDF390",
+"K^	c #FDF491",
+"L^	c #FDF496",
+"M^	c #FDF49B",
+"N^	c #FDF49D",
+"O^	c #FEF59E",
+"P^	c #FEE575",
+"Q^	c #FCDE4F",
+"R^	c #FAFBA2",
+"S^	c #FAF972",
+"T^	c #F9F85D",
+"U^	c #F9F85C",
+"V^	c #F9F85B",
+"W^	c #F8F356",
+"X^	c #E3C942",
+"Y^	c #DAC03E",
+"Z^	c #FBD846",
+"`^	c #FDE850",
+" /	c #F7EA49",
+"./	c #D8C53E",
+"+/	c #E4C63E",
+"@/	c #FFDE48",
+"#/	c #E7D93E",
+"$/	c #9E932A",
+"%/	c #645D1B",
+"&/	c #3A360F",
+"*/	c #2A270C",
+"=/	c #312F18",
+"-/	c #49462F",
+";/	c #605E45",
+">/	c #7A775C",
+",/	c #8F8C67",
+"'/	c #C1BA75",
+")/	c #F1E683",
+"!/	c #FDF387",
+"~/	c #CFC87D",
+"{/	c #7A7867",
+"]/	c #767468",
+"^/	c #BFB97B",
+"//	c #FEF5A0",
+"(/	c #FDF4A1",
+"_/	c #FEF3A2",
+":/	c #FEE262",
+"</	c #FBE353",
+"[/	c #FAFBB0",
+"}/	c #FAFDB3",
+"|/	c #FAFCAA",
+"1/	c #F9F96B",
+"2/	c #F5E750",
+"3/	c #D6BB3C",
+"4/	c #ECCB42",
+"5/	c #FBF053",
+"6/	c #EEE045",
+"7/	c #D2BC3B",
+"8/	c #F3D244",
+"9/	c #FEE448",
+"0/	c #E0D23C",
+"a/	c #322E0E",
+"b/	c #232115",
+"c/	c #242423",
+"d/	c #383838",
+"e/	c #4D4D4D",
+"f/	c #545454",
+"g/	c #555555",
+"h/	c #575757",
+"i/	c #595959",
+"j/	c #5A5A5A",
+"k/	c #68685F",
+"l/	c #7C7A65",
+"m/	c #AFA973",
+"n/	c #A09B70",
+"o/	c #656563",
+"p/	c #636363",
+"q/	c #928F70",
+"r/	c #FDF492",
+"s/	c #FDF399",
+"t/	c #FEF5A1",
+"u/	c #FEF4A3",
+"v/	c #FEDD4F",
+"w/	c #FAEA63",
+"x/	c #FAF96F",
+"y/	c #F9F85E",
+"z/	c #F9F357",
+"A/	c #E8D145",
+"B/	c #D6BC3C",
+"C/	c #F8D545",
+"D/	c #FDE54E",
+"E/	c #FAED4A",
+"F/	c #DECF3F",
+"G/	c #DDC13D",
+"H/	c #FDEB4A",
+"I/	c #D5CA3E",
+"J/	c #A79E30",
+"K/	c #9A922D",
+"L/	c #8E8729",
+"M/	c #817A25",
+"N/	c #99912C",
+"O/	c #B0A53B",
+"P/	c #54502F",
+"Q/	c #3E3D37",
+"R/	c #484848",
+"S/	c #4E4E4E",
+"T/	c #505050",
+"U/	c #535351",
+"V/	c #5F5E56",
+"W/	c #656458",
+"X/	c #636259",
+"Y/	c #60605A",
+"Z/	c #5B5B5B",
+"`/	c #5C5C5C",
+" (	c #5E5E5E",
+".(	c #656461",
+"+(	c #716F65",
+"@(	c #646464",
+"#(	c #7C7A6B",
+"$(	c #E1D986",
+"%(	c #FDF493",
+"&(	c #FDF39A",
+"*(	c #FEF4A2",
+"=(	c #FEF39A",
+"-(	c #FAF075",
+";(	c #FAF871",
+">(	c #F9F860",
+",(	c #F7EB52",
+"'(	c #DABF3D",
+")(	c #E4C53F",
+"!(	c #FCED52",
+"~(	c #F4E94B",
+"{(	c #E6DE47",
+"](	c #DBD242",
+"^(	c #CFC63E",
+"/(	c #C2B93A",
+"((	c #B5AD37",
+"_(	c #A9A233",
+":(	c #9C952E",
+"<(	c #F5E949",
+"[(	c #F5EA48",
+"}(	c #D6BF3C",
+"|(	c #EDCB42",
+"1(	c #797223",
+"2(	c #141306",
+"3(	c #100F05",
+"4(	c #0C0B03",
+"5(	c #040401",
+"6(	c #2E2C0D",
+"7(	c #E0D53F",
+"8(	c #FCF057",
+"9(	c #F8EC67",
+"0(	c #9A955A",
+"a(	c #5E5D4E",
+"b(	c #4A4A4A",
+"c(	c #4C4C4C",
+"d(	c #565551",
+"e(	c #6C6A57",
+"f(	c #9C9765",
+"g(	c #BCB56F",
+"h(	c #CFC775",
+"i(	c #C4BD74",
+"j(	c #B5AF71",
+"k(	c #A39E6D",
+"l(	c #787662",
+"m(	c #64635F",
+"n(	c #5F5F5F",
+"o(	c #606060",
+"p(	c #626262",
+"q(	c #656565",
+"r(	c #6E6D68",
+"s(	c #BCB67D",
+"t(	c #FEF5A3",
+"u(	c #FEF088",
+"v(	c #FED946",
+"w(	c #FAF47F",
+"x(	c #F9F96A",
+"y(	c #F9F75E",
+"z(	c #F9F75D",
+"A(	c #EED948",
+"B(	c #D5B93B",
+"C(	c #F4D244",
+"D(	c #F0E74C",
+"E(	c #D7CF44",
+"F(	c #CAC340",
+"G(	c #BDB63B",
+"H(	c #B0AA37",
+"I(	c #A49E33",
+"J(	c #98922F",
+"K(	c #8B852B",
+"L(	c #6C6821",
+"M(	c #5A561B",
+"N(	c #393712",
+"O(	c #302E0F",
+"P(	c #2B2A0D",
+"Q(	c #27250C",
+"R(	c #22200A",
+"S(	c #1D1B09",
+"T(	c #181707",
+"U(	c #111005",
+"V(	c #201E09",
+"W(	c #BAB137",
+"X(	c #FBEE4A",
+"Y(	c #E7D742",
+"Z(	c #D7BB3B",
+"`(	c #F3E746",
+" _	c #373410",
+"._	c #000000",
+"+_	c #0F0E04",
+"@_	c #FCEF54",
+"#_	c #FCF165",
+"$_	c #FDF274",
+"%_	c #FAEF76",
+"&_	c #9D985E",
+"*_	c #57564C",
+"=_	c #494949",
+"-_	c #4B4B4B",
+";_	c #565550",
+">_	c #8A875F",
+",_	c #E1D878",
+"'_	c #FDF380",
+")_	c #FDF382",
+"!_	c #FDF384",
+"~_	c #FDF386",
+"{_	c #E8DF80",
+"]_	c #A8A371",
+"^_	c #777565",
+"/_	c #656462",
+"(_	c #676767",
+"__	c #8F8D73",
+":_	c #FBF18F",
+"<_	c #FEEE75",
+"[_	c #F9F984",
+"}_	c #FAFCB1",
+"|_	c #FAFA83",
+"1_	c #FAF971",
+"2_	c #F9F861",
+"3_	c #F9EF55",
+"4_	c #DEBF3D",
+"5_	c #FCE950",
+"6_	c #CDC541",
+"7_	c #434115",
+"8_	c #343210",
+"9_	c #2E2C0F",
+"0_	c #29280D",
+"a_	c #24230B",
+"b_	c #1F1E0A",
+"c_	c #1B1A08",
+"d_	c #161507",
+"e_	c #131206",
+"f_	c #0F0E05",
+"g_	c #0A0903",
+"h_	c #030301",
+"i_	c #060602",
+"j_	c #716B22",
+"k_	c #F8EB49",
+"l_	c #D8C43E",
+"m_	c #E4C440",
+"n_	c #FEDF49",
+"o_	c #C1B738",
+"p_	c #1F1D09",
+"q_	c #EBDF43",
+"r_	c #FCEE4E",
+"s_	c #FCF061",
+"t_	c #FCF271",
+"u_	c #FDF275",
+"v_	c #FDF276",
+"w_	c #A19C5E",
+"x_	c #58574B",
+"y_	c #54534F",
+"z_	c #85815D",
+"A_	c #EDE37A",
+"B_	c #FDF280",
+"C_	c #FDF381",
+"D_	c #FDF383",
+"E_	c #FDF385",
+"F_	c #E0D881",
+"G_	c #908D6E",
+"H_	c #686864",
+"I_	c #666666",
+"J_	c #686868",
+"K_	c #7C7B6D",
+"L_	c #DDD588",
+"M_	c #FDF498",
+"N_	c #FDF5A3",
+"O_	c #FEF4A4",
+"P_	c #FEEA63",
+"Q_	c #F9F987",
+"R_	c #FAFCA8",
+"S_	c #FBFA9E",
+"T_	c #FAFA81",
+"U_	c #FAFA74",
+"V_	c #F9F967",
+"W_	c #F9F65D",
+"X_	c #F4E24D",
+"Y_	c #D5B83B",
+"Z_	c #EDCC42",
+"`_	c #FBF154",
+" :	c #9A9431",
+".:	c #121106",
+"+:	c #25240B",
+"@:	c #191807",
+"#:	c #070702",
+"$:	c #2D2B0E",
+"%:	c #E4D944",
+"&:	c #EEDF45",
+"*:	c #D4BB3B",
+"=:	c #FDE548",
+"-:	c #9E962D",
+";:	c #FCEF4F",
+">:	c #FCF064",
+",:	c #FCF171",
+"':	c #FCF273",
+"):	c #CBC469",
+"!:	c #605E4D",
+"~:	c #51514D",
+"{:	c #807E5C",
+"]:	c #E9DF78",
+"^:	c #FDF27F",
+"/:	c #FDF388",
+"(:	c #FDF389",
+"_:	c #E9E085",
+"::	c #8C8A6F",
+"<:	c #696866",
+"[:	c #696969",
+"}:	c #706F6B",
+"|:	c #B8B37F",
+"1:	c #FEF5A2",
+"2:	c #FEE451",
+"3:	c #F9FA89",
+"4:	c #FAFDB1",
+"5:	c #FAFA7B",
+"6:	c #F9F96C",
+"7:	c #F9F960",
+"8:	c #F9F95E",
+"9:	c #E8CD44",
+"0:	c #D8BA3C",
+"a:	c #FAD747",
+"b:	c #FDE64E",
+"c:	c #696622",
+"d:	c #020201",
+"e:	c #090903",
+"f:	c #23220B",
+"g:	c #201F0A",
+"h:	c #A9A234",
+"i:	c #D7CE42",
+"j:	c #C5BD3C",
+"k:	c #AFA735",
+"l:	c #6A6520",
+"m:	c #2A280D",
+"n:	c #0C0B04",
+"o:	c #A09830",
+"p:	c #FAEC49",
+"q:	c #DFCE3E",
+"r:	c #E0C03D",
+"s:	c #FEDD49",
+"t:	c #454114",
+"u:	c #191707",
+"v:	c #434013",
+"w:	c #F3E745",
+"x:	c #FCF170",
+"y:	c #FCF071",
+"z:	c #FCF172",
+"A:	c #F4EA74",
+"B:	c #797653",
+"C:	c #494947",
+"D:	c #676554",
+"E:	c #DCD375",
+"F:	c #FDF27E",
+"G:	c #FDF287",
+"H:	c #FDF38A",
+"I:	c #FDF28B",
+"J:	c #E5DB86",
+"K:	c #8B886F",
+"L:	c #6B6B68",
+"M:	c #6B6B6B",
+"N:	c #8E8C74",
+"O:	c #F9F091",
+"P:	c #FDF494",
+"Q:	c #FEDF44",
+"R:	c #FAFA80",
+"S:	c #FAF973",
+"T:	c #F9F865",
+"U:	c #F9F95F",
+"V:	c #F8E952",
+"W:	c #DABD3B",
+"X:	c #E6C53F",
+"Y:	c #FBED52",
+"Z:	c #F3EA4D",
+"`:	c #363411",
+" <	c #CCC43F",
+".<	c #F4EB4C",
+"+<	c #2E2C0E",
+"@<	c #EFE549",
+"#<	c #D9D042",
+"$<	c #161506",
+"%<	c #010100",
+"&<	c #504C18",
+"*<	c #F2E546",
+"=<	c #D4BF3B",
+"-<	c #F0CE43",
+";<	c #D4B63C",
+"><	c #25210A",
+",<	c #080702",
+"'<	c #423F13",
+")<	c #ADA431",
+"!<	c #FCEF57",
+"~<	c #FCF16F",
+"{<	c #FCF26F",
+"]<	c #B8B163",
+"^<	c #545449",
+"/<	c #88855E",
+"(<	c #FDF17F",
+"_<	c #FDF28C",
+":<	c #E0D886",
+"<<	c #888670",
+"[<	c #6B6B6A",
+"}<	c #6C6C6C",
+"|<	c #7E7D71",
+"1<	c #DAD38A",
+"2<	c #FEF5A4",
+"3<	c #FEF28D",
+"4<	c #F9FA8E",
+"5<	c #FAFCAF",
+"6<	c #FAFB8A",
+"7<	c #EED949",
+"8<	c #CBC341",
+"9<	c #22210B",
+"0<	c #353311",
+"a<	c #B6B039",
+"b<	c #7C7727",
+"c<	c #2C2A0E",
+"d<	c #EAE148",
+"e<	c #F6EB4A",
+"f<	c #23210A",
+"g<	c #CCC13D",
+"h<	c #E3D240",
+"i<	c #DBBF3C",
+"j<	c #9C862C",
+"k<	c #110F05",
+"l<	c #736C21",
+"m<	c #524E17",
+"n<	c #F9EC46",
+"o<	c #FCF05D",
+"p<	c #FCF16E",
+"q<	c #FCF270",
+"r<	c #FBF175",
+"s<	c #7C7954",
+"t<	c #474747",
+"u<	c #5B5A50",
+"v<	c #C0B86C",
+"w<	c #FDF38B",
+"x<	c #DAD286",
+"y<	c #888572",
+"z<	c #787870",
+"A<	c #B5B181",
+"B<	c #FEEF7A",
+"C<	c #FEDA46",
+"D<	c #FDDC4C",
+"E<	c #F9F988",
+"F<	c #FAFB88",
+"G<	c #FAFB7D",
+"H<	c #FAFA71",
+"I<	c #F9FA63",
+"J<	c #F9FA60",
+"K<	c #F9F95D",
+"L<	c #F8F85E",
+"M<	c #ECEB58",
+"N<	c #E0DF53",
+"O<	c #D4D34F",
+"P<	c #C7C64A",
+"Q<	c #BCBB46",
+"R<	c #F7F55C",
+"S<	c #F9EF53",
+"T<	c #DFC43F",
+"U<	c #DFC03D",
+"V<	c #FDD948",
+"W<	c #FCEB50",
+"X<	c #9E9933",
+"Y<	c #BFB83C",
+"Z<	c #87812A",
+"`<	c #27260C",
+" [	c #DFD745",
+".[	c #968F2D",
+"+[	c #1A1808",
+"@[	c #0B0A03",
+"#[	c #867F28",
+"$[	c #F4E846",
+"%[	c #D3BF3C",
+"&[	c #ECCB41",
+"*[	c #5B4E1A",
+"=[	c #2D2B0D",
+"-[	c #E4D841",
+";[	c #BDB337",
+">[	c #FCF163",
+",[	c #FCF173",
+"'[	c #D5CD6B",
+")[	c #5E5C4C",
+"![	c #6D6B56",
+"~[	c #EDE479",
+"{[	c #D5CE85",
+"][	c #969477",
+"^[	c #BFBA83",
+"/[	c #E8E08E",
+"([	c #FDF5A4",
+"_[	c #FEF4A5",
+":[	c #FEEA68",
+"<[	c #F8F862",
+"[[	c #F8FA6C",
+"}[	c #F9FC86",
+"|[	c #FAFC9F",
+"1[	c #FAFCA7",
+"2[	c #FAFB90",
+"3[	c #FAF979",
+"4[	c #F9F96E",
+"5[	c #F9FA64",
+"6[	c #F9FA61",
+"7[	c #F4F55E",
+"8[	c #E7E859",
+"9[	c #DCDC55",
+"0[	c #CFCF50",
+"a[	c #C2C24A",
+"b[	c #B6B645",
+"c[	c #A9A840",
+"d[	c #9D9D3C",
+"e[	c #919137",
+"f[	c #848432",
+"g[	c #76762D",
+"h[	c #636325",
+"i[	c #51511F",
+"j[	c #414119",
+"k[	c #343414",
+"l[	c #2E2E11",
+"m[	c #29290F",
+"n[	c #24240D",
+"o[	c #1F1F0C",
+"p[	c #2D2C11",
+"q[	c #BDBC47",
+"r[	c #F2DF4C",
+"s[	c #D5BB3C",
+"t[	c #F0CF42",
+"u[	c #FEE04B",
+"v[	c #FBF355",
+"w[	c #6F6B23",
+"x[	c #AEA737",
+"y[	c #948E2E",
+"z[	c #0E0D04",
+"A[	c #D4CB41",
+"B[	c #F9ED4A",
+"C[	c #6E6821",
+"D[	c #3A3711",
+"E[	c #FAED47",
+"F[	c #E7D941",
+"G[	c #D7BD3B",
+"H[	c #2B250C",
+"I[	c #5F581B",
+"J[	c #A2992E",
+"K[	c #181607",
+"L[	c #0C0C08",
+"M[	c #7E7A43",
+"N[	c #FCF26D",
+"O[	c #ACA660",
+"P[	c #4F4F49",
+"Q[	c #949060",
+"R[	c #FDF281",
+"S[	c #FCF292",
+"T[	c #FEE352",
+"U[	c #F8FA63",
+"V[	c #F7FB64",
+"W[	c #F8FB6B",
+"X[	c #F8FA70",
+"Y[	c #F9FA74",
+"Z[	c #F9FA76",
+"`[	c #F9FB79",
+" }	c #F9FB7B",
+".}	c #F9FC7D",
+"+}	c #FAFB77",
+"@}	c #F9FB70",
+"#}	c #F9FB69",
+"$}	c #F9FA62",
+"%}	c #F9F961",
+"&}	c #8C8C36",
+"*}	c #7F7F31",
+"=}	c #6F702B",
+"-}	c #5D5D24",
+";}	c #4B4B1D",
+">}	c #3B3B17",
+",}	c #313113",
+"'}	c #2C2C11",
+")}	c #27270F",
+"!}	c #22220D",
+"~}	c #1D1D0B",
+"{}	c #181809",
+"]}	c #141307",
+"^}	c #121207",
+"/}	c #0E0E05",
+"(}	c #070703",
+"_}	c #080803",
+":}	c #696927",
+"<}	c #E6CB43",
+"[}	c #DABE3C",
+"}}	c #FCE84F",
+"|}	c #F6EC4E",
+"1}	c #3A3813",
+"2}	c #6A6621",
+"3}	c #9E9831",
+"4}	c #121105",
+"5}	c #C8C03D",
+"6}	c #EBE045",
+"7}	c #4C4817",
+"8}	c #ECE144",
+"9}	c #F7EB47",
+"0}	c #D8C53D",
+"a}	c #E8C840",
+"b}	c #AB9331",
+"c}	c #161306",
+"d}	c #100E05",
+"e}	c #9C8B2D",
+"f}	c #0C0C0C",
+"g}	c #2F2F2F",
+"h}	c #53513E",
+"i}	c #D7CD63",
+"j}	c #FCF073",
+"k}	c #8E8A59",
+"l}	c #4F4F4E",
+"m}	c #A6A066",
+"n}	c #FDF288",
+"o}	c #FDF28E",
+"p}	c #FEF39D",
+"q}	c #FEDB44",
+"r}	c #F9F15D",
+"s}	c #F7FB63",
+"t}	c #F8FB64",
+"u}	c #F8FA64",
+"v}	c #F8FB62",
+"w}	c #F8FB63",
+"x}	c #F9FB63",
+"y}	c #F9FB62",
+"z}	c #43441A",
+"A}	c #2A2A10",
+"B}	c #D1D04D",
+"C}	c #F6E64E",
+"D}	c #E9C840",
+"E}	c #D0C842",
+"F}	c #25240C",
+"G}	c #2C2B0E",
+"H}	c #D5CC43",
+"I}	c #A9A235",
+"J}	c #151406",
+"K}	c #BBB53A",
+"L}	c #DFD442",
+"M}	c #E9DA43",
+"N}	c #D6BD3C",
+"O}	c #6F5E1F",
+"P}	c #040301",
+"Q}	c #231E0A",
+"R}	c #D1B53B",
+"S}	c #FDE948",
+"T}	c #8C8528",
+"U}	c #131313",
+"V}	c #313131",
+"W}	c #343434",
+"X}	c #3C3B37",
+"Y}	c #938E51",
+"Z}	c #6E6C51",
+"`}	c #AEA869",
+" |	c #FDF181",
+".|	c #FDF282",
+"+|	c #FDF39C",
+"@|	c #FEF4A6",
+"#|	c #FEEF83",
+"$|	c #FED846",
+"%|	c #FAEC59",
+"&|	c #F6FB64",
+"*|	c #575722",
+"=|	c #23230E",
+"-|	c #19190A",
+";|	c #0A0A04",
+">|	c #20200C",
+",|	c #303012",
+"'|	c #49491C",
+")|	c #5C5C23",
+"!|	c #575721",
+"~|	c #52521F",
+"{|	c #4C4C1D",
+"]|	c #353514",
+"^|	c #101006",
+"/|	c #81802F",
+"(|	c #EAD146",
+"_|	c #FDE74F",
+":|	c #DCD547",
+"<|	c #C7C040",
+"[|	c #BBB53C",
+"}|	c #AEA938",
+"||	c #A29D34",
+"1|	c #969130",
+"2|	c #89842B",
+"3|	c #716D24",
+"4|	c #4F4C19",
+"5|	c #312F0F",
+"6|	c #474416",
+"7|	c #DAD144",
+"8|	c #B6AF39",
+"9|	c #191808",
+"0|	c #B0A936",
+"a|	c #F8EB48",
+"b|	c #CDBA38",
+"c|	c #322B0C",
+"d|	c #3F3612",
+"e|	c #FBD948",
+"f|	c #FEE348",
+"g|	c #DCD13F",
+"h|	c #413F24",
+"i|	c #333333",
+"j|	c #363636",
+"k|	c #595841",
+"l|	c #E2D969",
+"m|	c #FDF277",
+"n|	c #F0E774",
+"o|	c #66654F",
+"p|	c #585751",
+"q|	c #B6AF6B",
+"r|	c #FEF5A5",
+"s|	c #FEE96B",
+"t|	c #FBE755",
+"u|	c #F7F963",
+"v|	c #DFE057",
+"w|	c #D0D151",
+"x|	c #B5B546",
+"y|	c #5B5B23",
+"z|	c #0C0C05",
+"A|	c #565621",
+"B|	c #BFBF49",
+"C|	c #F2F15C",
+"D|	c #F0F05B",
+"E|	c #C3C34A",
+"F|	c #929237",
+"G|	c #4B4B1C",
+"H|	c #151508",
+"I|	c #333313",
+"J|	c #E3E254",
+"K|	c #F8ED51",
+"L|	c #E5C540",
+"M|	c #DCD54A",
+"N|	c #D0CA45",
+"O|	c #B7B23D",
+"P|	c #AAA638",
+"Q|	c #9E9A34",
+"R|	c #928E30",
+"S|	c #86822C",
+"T|	c #797528",
+"U|	c #666321",
+"V|	c #A19C35",
+"W|	c #726F24",
+"X|	c #21200B",
+"Y|	c #1D1C09",
+"Z|	c #171607",
+"`|	c #050502",
+" 1	c #CDC540",
+".1	c #C1B93C",
+"+1	c #1E1C09",
+"@1	c #A49E32",
+"#1	c #ADA131",
+"$1	c #221E06",
+"%1	c #070602",
+"&1	c #816F24",
+"*1	c #FEE248",
+"=1	c #FDEB48",
+"-1	c #FCF05A",
+";1	c #908B4B",
+">1	c #3A3934",
+",1	c #353535",
+"'1	c #373737",
+")1	c #42413B",
+"!1	c #A19C57",
+"~1	c #FCF272",
+"{1	c #FDF174",
+"]1	c #FDF278",
+"^1	c #EEE574",
+"/1	c #676550",
+"(1	c #5B5B52",
+"_1	c #BFB86E",
+":1	c #FAEF8D",
+"<1	c #F3E98D",
+"[1	c #ECE38B",
+"}1	c #E5DD8B",
+"|1	c #DED689",
+"11	c #D8D08A",
+"21	c #D1CA89",
+"31	c #CBC488",
+"41	c #C4BF88",
+"51	c #BEB987",
+"61	c #B8B387",
+"71	c #AEAA85",
+"81	c #AAA786",
+"91	c #F6EC99",
+"01	c #FDF4A6",
+"a1	c #FEF4A7",
+"b1	c #FEE153",
+"c1	c #FCE251",
+"d1	c #F8F962",
+"e1	c #C6C74C",
+"f1	c #25250E",
+"g1	c #C6C64C",
+"h1	c #F0EF5A",
+"i1	c #979739",
+"j1	c #323113",
+"k1	c #0B0B04",
+"l1	c #131207",
+"m1	c #959537",
+"n1	c #EED748",
+"o1	c #F7D545",
+"p1	c #DFCB45",
+"q1	c #B0AC3C",
+"r1	c #86842E",
+"s1	c #58561E",
+"t1	c #656322",
+"u1	c #7D7A2A",
+"v1	c #8D8A30",
+"w1	c #BBB840",
+"x1	c #F9F455",
+"y1	c #BCB83F",
+"z1	c #6C6924",
+"A1	c #EFE950",
+"B1	c #424016",
+"C1	c #21210B",
+"D1	c #1E1D0A",
+"E1	c #111006",
+"F1	c #0D0C04",
+"G1	c #8E892E",
+"H1	c #7F7B29",
+"I1	c #3B3913",
+"J1	c #D2C942",
+"K1	c #CDC53F",
+"L1	c #22210A",
+"M1	c #99922E",
+"N1	c #807B25",
+"O1	c #0D0C02",
+"P1	c #010000",
+"Q1	c #191607",
+"R1	c #B6A934",
+"S1	c #FCEC47",
+"T1	c #FCF15A",
+"U1	c #FCF26A",
+"V1	c #D3CA5F",
+"W1	c #51503C",
+"X1	c #393939",
+"Y1	c #616045",
+"Z1	c #ECE26D",
+"`1	c #EBE373",
+" 2	c #666551",
+".2	c #4F4F4F",
+"+2	c #5D5C53",
+"@2	c #C6BF71",
+"#2	c #EDE489",
+"$2	c #8C8971",
+"%2	c #83816F",
+"&2	c #828070",
+"*2	c #817F72",
+"=2	c #7F7D72",
+"-2	c #7E7C73",
+";2	c #7C7B73",
+">2	c #7C7C75",
+",2	c #7B7B76",
+"'2	c #7A7977",
+")2	c #787878",
+"!2	c #797979",
+"~2	c #908E80",
+"{2	c #F0E798",
+"]2	c #FED945",
+"^2	c #FCDD4D",
+"/2	c #F7FA64",
+"(2	c #F8F964",
+"_2	c #F9FB61",
+":2	c #EDEE5B",
+"<2	c #2B2B10",
+"[2	c #E3E256",
+"}2	c #DAD851",
+"|2	c #5C5B22",
+"12	c #404018",
+"22	c #EFEE58",
+"32	c #F9F65A",
+"42	c #E1DF51",
+"52	c #D8D54D",
+"62	c #E2E051",
+"72	c #EDE954",
+"82	c #F9F559",
+"92	c #F9EF51",
+"02	c #DCC13D",
+"a2	c #857226",
+"b2	c #2E280D",
+"c2	c #191708",
+"d2	c #0A0A03",
+"e2	c #20200B",
+"f2	c #6A6724",
+"g2	c #1D1D0A",
+"h2	c #C1BC41",
+"i2	c #464417",
+"j2	c #2F2E0F",
+"k2	c #9A9432",
+"l2	c #C3BD3F",
+"m2	c #7C7828",
+"n2	c #3E3C14",
+"o2	c #7D7827",
+"p2	c #E2D847",
+"q2	c #8D872B",
+"r2	c #F8EC48",
+"s2	c #3E3B12",
+"t2	c #2C2A0D",
+"u2	c #E7DA42",
+"v2	c #FCF05B",
+"w2	c #FCF16C",
+"x2	c #7C7848",
+"y2	c #383836",
+"z2	c #3A3A3A",
+"A2	c #49483F",
+"B2	c #B0AA5D",
+"C2	c #FDF176",
+"D2	c #EDE475",
+"E2	c #686751",
+"F2	c #5D5C54",
+"G2	c #C0B970",
+"H2	c #FDF28A",
+"I2	c #F3E98C",
+"J2	c #838170",
+"K2	c #6A6A6A",
+"L2	c #6D6D6D",
+"M2	c #6F6F6F",
+"N2	c #707070",
+"O2	c #727272",
+"P2	c #747474",
+"Q2	c #757575",
+"R2	c #777777",
+"S2	c #7D7D79",
+"T2	c #8B8A7E",
+"U2	c #9C9A83",
+"V2	c #EDE599",
+"W2	c #FEED80",
+"X2	c #F9F35D",
+"Y2	c #F7FA63",
+"Z2	c #595922",
+"`2	c #E7E658",
+" 3	c #E2E255",
+".3	c #CCCC4D",
+"+3	c #BFBF48",
+"@3	c #EFEE59",
+"#3	c #EBE958",
+"$3	c #636225",
+"%3	c #111106",
+"&3	c #AAA93F",
+"*3	c #E7E553",
+"=3	c #A4A23B",
+"-3	c #6C6B27",
+";3	c #3F3E17",
+">3	c #2A2A0F",
+",3	c #25250D",
+"'3	c #2E2D10",
+")3	c #434218",
+"!3	c #8A8831",
+"~3	c #C6C347",
+"{3	c #F6F157",
+"]3	c #EED848",
+"^3	c #D6BA3B",
+"/3	c #C0A536",
+"(3	c #463C14",
+"_3	c #131005",
+":3	c #151407",
+"<3	c #171608",
+"[3	c #1B1B09",
+"}3	c #0E0D05",
+"|3	c #908C30",
+"13	c #9D9834",
+"23	c #2C2B0F",
+"33	c #0B0A04",
+"43	c #E2DB4A",
+"53	c #F7EF50",
+"63	c #1F1D0A",
+"73	c #AEA838",
+"83	c #E3DA46",
+"93	c #817C27",
+"03	c #CBC13B",
+"a3	c #FCEF5B",
+"b3	c #FCF169",
+"c3	c #FCF269",
+"d3	c #FCF26B",
+"e3	c #FCF26C",
+"f3	c #C2BB5C",
+"g3	c #4D4B3C",
+"h3	c #3C3C3C",
+"i3	c #6C6A4A",
+"j3	c #F4EA70",
+"k3	c #FDF279",
+"l3	c #FCF279",
+"m3	c #747155",
+"n3	c #555552",
+"o3	c #A7A26A",
+"p3	c #FDF182",
+"q3	c #FBF08E",
+"r3	c #ADA87A",
+"s3	c #979476",
+"t3	c #888672",
+"u3	c #717171",
+"v3	c #737373",
+"w3	c #767676",
+"x3	c #807F79",
+"y3	c #B3AF87",
+"z3	c #E2DA94",
+"A3	c #FBF19C",
+"B3	c #FDF39D",
+"C3	c #FEF5A6",
+"D3	c #FEF5A7",
+"E3	c #FEE45E",
+"F3	c #FAE957",
+"G3	c #F9FA5F",
+"H3	c #858533",
+"I3	c #DCDB54",
+"J3	c #71712B",
+"K3	c #21210D",
+"L3	c #EEED58",
+"M3	c #686826",
+"N3	c #151408",
+"O3	c #7F7E2F",
+"P3	c #DAD64F",
+"Q3	c #7C7A2C",
+"R3	c #323112",
+"S3	c #0C0C04",
+"T3	c #21210C",
+"U3	c #5C5A20",
+"V3	c #E4E050",
+"W3	c #F9ED53",
+"X3	c #C5AC36",
+"Y3	c #3D3410",
+"Z3	c #060502",
+"`3	c #7B7629",
+" 4	c #B2AF3D",
+".4	c #9D9A35",
+"+4	c #6D6B25",
+"@4	c #2A290E",
+"#4	c #D8D247",
+"$4	c #3D3B14",
+"%4	c #928D30",
+"&4	c #7D7928",
+"*4	c #F9F04E",
+"=4	c #F0E74A",
+"-4	c #746F23",
+";4	c #948D2B",
+">4	c #F9EC5B",
+",4	c #EEE463",
+"'4	c #E4DB62",
+")4	c #D9D161",
+"!4	c #CFC75F",
+"~4	c #C4BC5C",
+"{4	c #B5AF59",
+"]4	c #646243",
+"^4	c #393938",
+"/4	c #3B3B3B",
+"(4	c #3D3D3D",
+"_4	c #4F4E42",
+":4	c #BCB562",
+"<4	c #FDF379",
+"[4	c #FDF37A",
+"}4	c #8E8B5D",
+"|4	c #515151",
+"14	c #535353",
+"24	c #858261",
+"34	c #F4EB8F",
+"44	c #BCB782",
+"54	c #7E7D73",
+"64	c #8C8B7D",
+"74	c #EDE597",
+"84	c #FDF4A7",
+"94	c #FEF49E",
+"04	c #FEDC45",
+"a4	c #FCE050",
+"b4	c #F8F762",
+"c4	c #929338",
+"d4	c #23230D",
+"e4	c #D0CF4F",
+"f4	c #4E4E1D",
+"g4	c #C8C74A",
+"h4	c #F0EF59",
+"i4	c #8B8A33",
+"j4	c #C4C349",
+"k4	c #CAC84A",
+"l4	c #2C2C10",
+"m4	c #28280E",
+"n4	c #1F1F0B",
+"o4	c #4E4D1C",
+"p4	c #DBD74D",
+"q4	c #F7F055",
+"r4	c #635A1E",
+"s4	c #110E02",
+"t4	c #322D0F",
+"u4	c #C5BB40",
+"v4	c #D6D149",
+"w4	c #676423",
+"x4	c #E3DC4C",
+"y4	c #B2AD3B",
+"z4	c #1F1F0A",
+"A4	c #3F3D15",
+"B4	c #BFB83D",
+"C4	c #353310",
+"D4	c #615D1D",
+"E4	c #1C1A09",
+"F4	c #4F4C2B",
+"G4	c #545337",
+"H4	c #525038",
+"I4	c #4F4D38",
+"J4	c #4D4B39",
+"K4	c #4A4838",
+"L4	c #484639",
+"M4	c #46453B",
+"N4	c #44433B",
+"O4	c #40403F",
+"P4	c #797650",
+"Q4	c #F9EE75",
+"R4	c #FDF37B",
+"S4	c #A9A464",
+"T4	c #525252",
+"U4	c #73715D",
+"V4	c #F2E77F",
+"W4	c #FCF293",
+"X4	c #A09D7D",
+"Y4	c #908E7E",
+"Z4	c #F5EC99",
+"`4	c #FDEF7C",
+" 5	c #FED746",
+".5	c #F8F460",
+"+5	c #9E9F3D",
+"@5	c #1E1E0C",
+"#5	c #C3C34B",
+"$5	c #F5F55D",
+"%5	c #BDBD47",
+"&5	c #BBB944",
+"*5	c #363514",
+"=5	c #424117",
+"-5	c #8A8932",
+";5	c #BFBD45",
+">5	c #E7E552",
+",5	c #DFDC4E",
+"'5	c #BFBC44",
+")5	c #6D6B27",
+"!5	c #191909",
+"~5	c #6D6B26",
+"{5	c #C7C344",
+"]5	c #22210C",
+"^5	c #090803",
+"/5	c #85812D",
+"(5	c #F3ED52",
+"_5	c #1A1909",
+":5	c #B3AD3C",
+"<5	c #5E5C1F",
+"[5	c #181708",
+"}5	c #A29D35",
+"|5	c #F4EC4E",
+"15	c #323110",
+"25	c #4E4B19",
+"35	c #FAF150",
+"45	c #423F14",
+"55	c #504D18",
+"65	c #DBD140",
+"75	c #28260B",
+"85	c #010101",
+"95	c #1C1C1C",
+"05	c #2B2B2B",
+"a5	c #2D2D2D",
+"b5	c #2E2E2E",
+"c5	c #303030",
+"d5	c #323232",
+"e5	c #3E3E3E",
+"f5	c #404040",
+"g5	c #565547",
+"h5	c #C9C168",
+"i5	c #FCF37B",
+"j5	c #D1C970",
+"k5	c #636253",
+"l5	c #6A685B",
+"m5	c #DAD27A",
+"n5	c #FDF48B",
+"o5	c #BEB985",
+"p5	c #777774",
+"q5	c #949280",
+"r5	c #FBF29B",
+"s5	c #FEF49F",
+"t5	c #FEE85A",
+"u5	c #FAEB59",
+"v5	c #F8F963",
+"w5	c #AAAB42",
+"x5	c #1A1A0A",
+"y5	c #B7B545",
+"z5	c #D3D350",
+"A5	c #26260E",
+"B5	c #B2B142",
+"C5	c #F4F158",
+"D5	c #383714",
+"E5	c #E4E252",
+"F5	c #F6F258",
+"G5	c #737129",
+"H5	c #373613",
+"I5	c #F4F056",
+"J5	c #A9A53B",
+"K5	c #8A8730",
+"L5	c #F6F053",
+"M5	c #827E2B",
+"N5	c #BEB93F",
+"O5	c #474417",
+"P5	c #F4EA4F",
+"Q5	c #CDC641",
+"R5	c #958F2F",
+"S5	c #403D13",
+"T5	c #A49C30",
+"U5	c #131205",
+"V5	c #1F1F1E",
+"W5	c #3A392E",
+"X5	c #3D3C31",
+"Y5	c #434133",
+"Z5	c #494736",
+"`5	c #4F4D39",
+" 6	c #54513B",
+".6	c #58573E",
+"+6	c #5E5C41",
+"@6	c #6B6846",
+"#6	c #79764B",
+"$6	c #7D794D",
+"%6	c #4B4A40",
+"&6	c #3F3F3F",
+"*6	c #454542",
+"=6	c #878256",
+"-6	c #FCF278",
+";6	c #F8EE7B",
+">6	c #797759",
+",6	c #605F58",
+"'6	c #B7B171",
+")6	c #FDF291",
+"!6	c #C1BB86",
+"~6	c #7A7975",
+"{6	c #989681",
+"]6	c #FEDF43",
+"^6	c #F8F861",
+"/6	c #F8FA62",
+"(6	c #B5B545",
+"_6	c #161609",
+":6	c #ABAA41",
+"<6	c #7F7F30",
+"[6	c #0D0D05",
+"}6	c #A6A53E",
+"|6	c #BFBD46",
+"16	c #1E1E0B",
+"26	c #4B4B1B",
+"36	c #C5C246",
+"46	c #CDCA48",
+"56	c #8B8830",
+"66	c #363513",
+"76	c #B0AD3D",
+"86	c #EDE951",
+"96	c #D0CC45",
+"06	c #302F10",
+"a6	c #4B4919",
+"b6	c #5B581E",
+"c6	c #1B1A09",
+"d6	c #ACA638",
+"e6	c #26250C",
+"f6	c #D2CA43",
+"g6	c #1D1D1D",
+"h6	c #3D3C30",
+"i6	c #97924A",
+"j6	c #BDB557",
+"k6	c #C8BF5A",
+"l6	c #D3C95E",
+"m6	c #DDD461",
+"n6	c #E8DF67",
+"o6	c #F3E96B",
+"p6	c #FCF26E",
+"q6	c #ECE26C",
+"r6	c #636146",
+"s6	c #414141",
+"t6	c #434343",
+"u6	c #5D5C4B",
+"v6	c #D5CD6E",
+"w6	c #FDF37C",
+"x6	c #FDF37E",
+"y6	c #5B5A53",
+"z6	c #7B7862",
+"A6	c #E9E080",
+"B6	c #B7B384",
+"C6	c #767675",
+"D6	c #959381",
+"E6	c #FDF5A8",
+"F6	c #F7F962",
+"G6	c #C1C24B",
+"H6	c #1C1C0B",
+"I6	c #9E9E3C",
+"J6	c #F2F25C",
+"K6	c #E4E457",
+"L6	c #D0D04F",
+"M6	c #B3B343",
+"N6	c #6F6F2A",
+"O6	c #9B9B3A",
+"P6	c #838230",
+"Q6	c #4F4E1D",
+"R6	c #E9E653",
+"S6	c #2D2C10",
+"T6	c #A4A13A",
+"U6	c #928F33",
+"V6	c #1E1E0A",
+"W6	c #323111",
+"X6	c #605E21",
+"Y6	c #88862E",
+"Z6	c #EAE54F",
+"`6	c #B4AE3C",
+" 7	c #A29D36",
+".7	c #F3EC50",
+"+7	c #BBB63D",
+"@7	c #757024",
+"#7	c #F0E648",
+"$7	c #DCD241",
+"%7	c #1E1E1E",
+"&7	c #292929",
+"*7	c #4E4C35",
+"=7	c #E5DC62",
+"-7	c #FCF168",
+";7	c #A19C59",
+">7	c #494842",
+",7	c #424242",
+"'7	c #4B4A46",
+")7	c #95905B",
+"!7	c #FDF37D",
+"~7	c #E9E07A",
+"{7	c #76735B",
+"]7	c #565656",
+"^7	c #585858",
+"/7	c #61605B",
+"(7	c #A6A16F",
+"_7	c #FDF48C",
+":7	c #FCF395",
+"<7	c #9E9B7E",
+"[7	c #7A7A7A",
+"}7	c #949282",
+"|7	c #F8EF9C",
+"17	c #FDF49F",
+"27	c #FEF5A9",
+"37	c #FDE95C",
+"47	c #FBE655",
+"57	c #CCCD4F",
+"67	c #373615",
+"77	c #171709",
+"87	c #908F36",
+"97	c #9F9D3A",
+"07	c #191809",
+"a7	c #0F0F05",
+"b7	c #918F34",
+"c7	c #F7F358",
+"d7	c #0D0D04",
+"e7	c #939134",
+"f7	c #C2BE44",
+"g7	c #2E2D0F",
+"h7	c #787528",
+"i7	c #DCD549",
+"j7	c #F9F251",
+"k7	c #28270D",
+"l7	c #979130",
+"m7	c #807A27",
+"n7	c #2A290D",
+"o7	c #E4DA45",
+"p7	c #9C9531",
+"q7	c #2E2D23",
+"r7	c #282828",
+"s7	c #736F40",
+"t7	c #FCF16A",
+"u7	c #E0D76C",
+"v7	c #5E5D48",
+"w7	c #444444",
+"x7	c #464646",
+"y7	c #65634F",
+"z7	c #E0D873",
+"A7	c #B9B26D",
+"B7	c #626158",
+"C7	c #747261",
+"D7	c #D9D17E",
+"E7	c #DED78E",
+"F7	c #868579",
+"G7	c #7B7B7B",
+"H7	c #929081",
+"I7	c #F2EA9B",
+"J7	c #FEF5A8",
+"K7	c #FEE144",
+"L7	c #F8F560",
+"M7	c #D8D953",
+"N7	c #26260F",
+"O7	c #858432",
+"P7	c #F0ED57",
+"Q7	c #54531F",
+"R7	c #5E5D22",
+"S7	c #DCD94E",
+"T7	c #3F3D16",
+"U7	c #888630",
+"V7	c #F3EE55",
+"W7	c #686523",
+"X7	c #DBD448",
+"Y7	c #B6B03B",
+"Z7	c #A49F34",
+"`7	c #27260D",
+" 8	c #D4CC43",
+".8	c #8C862B",
+"+8	c #26240B",
+"@8	c #D8CF41",
+"#8	c #635F33",
+"$8	c #272727",
+"%8	c #37362E",
+"&8	c #A7A14F",
+"*8	c #948E57",
+"=8	c #484743",
+"-8	c #454545",
+";8	c #504F4A",
+">8	c #9D9860",
+",8	c #FCF37D",
+"'8	c #FDF37F",
+")8	c #F6EC7F",
+"!8	c #8B8762",
+"~8	c #5C5B57",
+"{8	c #5F5F5D",
+"]8	c #908D6B",
+"^8	c #E6DE82",
+"/8	c #E3DC8F",
+"(8	c #9A987D",
+"_8	c #787876",
+":8	c #908E82",
+"<8	c #ECE59A",
+"[8	c #FDF5A9",
+"}8	c #FDF085",
+"|8	c #FDD74A",
+"18	c #FAEA57",
+"28	c #E4E458",
+"38	c #1B1B0A",
+"48	c #131307",
+"58	c #79792D",
+"68	c #F9F55B",
+"78	c #D0CC4B",
+"88	c #C1BE45",
+"98	c #E3E051",
+"08	c #BBB843",
+"a8	c #626023",
+"b8	c #2B2A0F",
+"c8	c #7D7B2C",
+"d8	c #E4E04E",
+"e8	c #4B4A1A",
+"f8	c #333211",
+"g8	c #B9B43D",
+"h8	c #F8EF51",
+"i8	c #524E1A",
+"j8	c #98912F",
+"k8	c #CDC43E",
+"l8	c #FCF04E",
+"m8	c #D2C954",
+"n8	c #44422E",
+"o8	c #434131",
+"p8	c #C8C059",
+"q8	c #FCF16B",
+"r8	c #FBF06D",
+"s8	c #FDEE70",
+"t8	c #FDEB71",
+"u8	c #FDEC73",
+"v8	c #FCF274",
+"w8	c #D4CC6A",
+"x8	c #5C5A49",
+"y8	c #656351",
+"z8	c #D7CF72",
+"A8	c #E9DF7D",
+"B8	c #828063",
+"C8	c #5B5B58",
+"D8	c #5D5D5D",
+"E8	c #646460",
+"F8	c #827F68",
+"G8	c #C9C27D",
+"H8	c #D1CB8A",
+"I8	c #8F8C7A",
+"J8	c #767674",
+"K8	c #7A7A79",
+"L8	c #7C7C7C",
+"M8	c #8F8D82",
+"N8	c #E6DF99",
+"O8	c #FDEC64",
+"P8	c #FCDD4E",
+"Q8	c #F9F761",
+"R8	c #EFEF5C",
+"S8	c #2F2F12",
+"T8	c #606025",
+"U8	c #BABA47",
+"V8	c #C5C54A",
+"W8	c #C8C84C",
+"X8	c #BBBB46",
+"Y8	c #373715",
+"Z8	c #ECE955",
+"`8	c #ACAA3E",
+" 9	c #807F2E",
+".9	c #49481A",
+"+9	c #2A290F",
+"@9	c #1A1A09",
+"#9	c #6E6C26",
+"$9	c #EDE852",
+"%9	c #9A9635",
+"&9	c #3D3C15",
+"*9	c #3E3C15",
+"=9	c #E2DC4A",
+"-9	c #B3AD3B",
+";9	c #636020",
+">9	c #999331",
+",9	c #A39C32",
+"'9	c #C1B83A",
+")9	c #FCF261",
+"!9	c #989347",
+"~9	c #313029",
+"{9	c #2A2A2A",
+"]9	c #4F4C36",
+"^9	c #E2D962",
+"/9	c #FCF06A",
+"(9	c #FBF06C",
+"_9	c #ECDB65",
+":9	c #FBE26E",
+"<9	c #FFE471",
+"[9	c #FEE874",
+"}9	c #FCF176",
+"|9	c #777451",
+"19	c #4E4E4B",
+"29	c #89855D",
+"39	c #FAF07D",
+"49	c #DED67B",
+"59	c #7D7B62",
+"69	c #5E5E5B",
+"79	c #616161",
+"89	c #757467",
+"99	c #A8A476",
+"09	c #E3DB86",
+"a9	c #FDF292",
+"b9	c #E9E18D",
+"c9	c #CDC787",
+"d9	c #ADA97F",
+"e9	c #868477",
+"f9	c #7D7C78",
+"g9	c #95937F",
+"h9	c #7D7D7D",
+"i9	c #8D8C82",
+"j9	c #E1DA98",
+"k9	c #FAEF5B",
+"l9	c #F9F962",
+"m9	c #F8F860",
+"n9	c #636326",
+"o9	c #CFCF4E",
+"p9	c #2D2D11",
+"q9	c #585820",
+"r9	c #DAD74E",
+"s9	c #8B8A32",
+"t9	c #5C5B20",
+"u9	c #ECE851",
+"v9	c #BDB941",
+"w9	c #52511C",
+"x9	c #8E8A2F",
+"y9	c #F7EF51",
+"z9	c #B3AD3A",
+"A9	c #D6CE44",
+"B9	c #ACA535",
+"C9	c #A09930",
+"D9	c #FCF04F",
+"E9	c #F5EB61",
+"F9	c #595635",
+"G9	c #5A5839",
+"H9	c #F9EE69",
+"I9	c #FAEF6B",
+"J9	c #D6C45A",
+"K9	c #EFD567",
+"L9	c #9E985D",
+"M9	c #4A4A46",
+"N9	c #605E52",
+"O9	c #BFB86D",
+"P9	c #E4DB7F",
+"Q9	c #8F8C69",
+"R9	c #686760",
+"S9	c #6D6C67",
+"T9	c #7C7A6C",
+"U9	c #8F8D72",
+"V9	c #A09D77",
+"W9	c #A9A57B",
+"X9	c #969377",
+"Y9	c #848373",
+"Z9	c #7B7A72",
+"`9	c #737371",
+" 0	c #858479",
+".0	c #AFAB85",
+"+0	c #EEE696",
+"@0	c #AEAA87",
+"#0	c #7F7F7D",
+"$0	c #7E7E7E",
+"%0	c #8B8A82",
+"&0	c #DCD598",
+"*0	c #FCE252",
+"=0	c #8D8C35",
+"-0	c #48481B",
+";0	c #E1E052",
+">0	c #F1EE58",
+",0	c #F6F259",
+"'0	c #989637",
+")0	c #727028",
+"!0	c #9E9B38",
+"~0	c #C8C546",
+"{0	c #78752A",
+"]0	c #4C4B1B",
+"^0	c #CFCB47",
+"/0	c #C3BF43",
+"(0	c #BFBB42",
+"_0	c #ECE850",
+":0	c #CCC845",
+"<0	c #ABA73A",
+"[0	c #AFAA39",
+"}0	c #7A7627",
+"|0	c #9D9730",
+"10	c #777124",
+"20	c #FCF050",
+"30	c #FCF263",
+"40	c #C1BA53",
+"50	c #3F3D2E",
+"60	c #5C593B",
+"70	c #F7EC68",
+"80	c #FAEF6C",
+"90	c #DCCD5C",
+"00	c #E6CC62",
+"a0	c #FEE271",
+"b0	c #FDEE76",
+"c0	c #D8D06C",
+"d0	c #6B694F",
+"e0	c #676555",
+"f0	c #959163",
+"g0	c #B3AD6D",
+"h0	c #D2CA76",
+"i0	c #FDF285",
+"j0	c #FDF286",
+"k0	c #F4EB85",
+"l0	c #ACA772",
+"m0	c #7A7866",
+"n0	c #686762",
+"o0	c #787774",
+"p0	c #918F7C",
+"q0	c #CFC98D",
+"r0	c #FCF399",
+"s0	c #FDF59A",
+"t0	c #E3DC95",
+"u0	c #929082",
+"v0	c #878780",
+"w0	c #929084",
+"x0	c #D7D097",
+"y0	c #50501F",
+"z0	c #404019",
+"A0	c #C8C74B",
+"B0	c #3A3916",
+"C0	c #EAE957",
+"D0	c #4D4D1C",
+"E0	c #3D3C16",
+"F0	c #8C8B33",
+"G0	c #F2EF58",
+"H0	c #E7E454",
+"I0	c #676525",
+"J0	c #474619",
+"K0	c #9E9C38",
+"L0	c #E9E553",
+"M0	c #888530",
+"N0	c #3E3D15",
+"O0	c #2D2C0F",
+"P0	c #C7C244",
+"Q0	c #EBE64F",
+"R0	c #A7A338",
+"S0	c #383713",
+"T0	c #F5ED50",
+"U0	c #9B9531",
+"V0	c #413E14",
+"W0	c #FCF151",
+"X0	c #FCF262",
+"Y0	c #DFD65B",
+"Z0	c #5B5936",
+"`0	c #2A2A28",
+" a	c #2C2C2C",
+".a	c #3E3D33",
+"+a	c #8E894B",
+"@a	c #C5BD5B",
+"#a	c #DFD564",
+"$a	c #F8ED6C",
+"%a	c #FBF16F",
+"&a	c #E5D863",
+"*a	c #DCC75C",
+"=a	c #FDE170",
+"-a	c #B9AD63",
+";a	c #7B7852",
+">a	c #605D4B",
+",a	c #4C4B47",
+"'a	c #595955",
+")a	c #959166",
+"!a	c #E6DE83",
+"~a	c #AFAA76",
+"{a	c #817F6B",
+"]a	c #767569",
+"^a	c #72726F",
+"/a	c #878576",
+"(a	c #96947C",
+"_a	c #B7B285",
+":a	c #EBE394",
+"<a	c #FDF59B",
+"[a	c #D3CD93",
+"}a	c #D2CC94",
+"|a	c #DAD497",
+"1a	c #EEE69C",
+"2a	c #FEF5AA",
+"3a	c #FDE958",
+"4a	c #F8FA61",
+"5a	c #626226",
+"6a	c #F3F25B",
+"7a	c #393815",
+"8a	c #353414",
+"9a	c #F4F25B",
+"0a	c #F8F75C",
+"aa	c #74742B",
+"ba	c #100F06",
+"ca	c #504F1D",
+"da	c #F9F65B",
+"ea	c #75722A",
+"fa	c #868530",
+"ga	c #F4F157",
+"ha	c #939034",
+"ia	c #333212",
+"ja	c #F8F456",
+"ka	c #F5F054",
+"la	c #FBEE51",
+"ma	c #FDE44E",
+"na	c #D0C846",
+"oa	c #29280E",
+"pa	c #57541D",
+"qa	c #ABA437",
+"ra	c #1A1908",
+"sa	c #D8CF45",
+"ta	c #736E23",
+"ua	c #ACA434",
+"va	c #EDE147",
+"wa	c #FCF054",
+"xa	c #F9EE5F",
+"ya	c #D4CC56",
+"za	c #9B9646",
+"Aa	c #545233",
+"Ba	c #2D2D29",
+"Ca	c #393832",
+"Da	c #464437",
+"Ea	c #514F3C",
+"Fa	c #7B7749",
+"Ga	c #EEE467",
+"Ha	c #D3C055",
+"Ia	c #FBE16F",
+"Ja	c #8C8256",
+"Ka	c #4D4D4C",
+"La	c #595851",
+"Ma	c #605F56",
+"Na	c #8E8B65",
+"Oa	c #FDF48A",
+"Pa	c #F2E989",
+"Qa	c #D7D083",
+"Ra	c #BEB87D",
+"Sa	c #A6A278",
+"Ta	c #A09C78",
+"Ua	c #9B9877",
+"Va	c #9B9879",
+"Wa	c #B7B181",
+"Xa	c #EAE291",
+"Ya	c #FDF59C",
+"Za	c #FEE145",
+"`a	c #F9F65F",
+" b	c #F8F961",
+".b	c #74742C",
+"+b	c #EEEE5A",
+"@b	c #9C9C3A",
+"#b	c #8B8A34",
+"$b	c #969538",
+"%b	c #F1EF5A",
+"&b	c #A3A23C",
+"*b	c #979537",
+"=b	c #B4B242",
+"-b	c #161508",
+";b	c #888731",
+">b	c #F9F659",
+",b	c #ECE852",
+"'b	c #BAB740",
+")b	c #1C1C0A",
+"!b	c #A4A038",
+"~b	c #F4E74E",
+"{b	c #EED347",
+"]b	c #FDDD4A",
+"^b	c #FFDE49",
+"/b	c #F9F352",
+"(b	c #F7EF53",
+"_b	c #373612",
+":b	c #817D2B",
+"<b	c #F4EB4F",
+"[b	c #E2D945",
+"}b	c #C3BA3C",
+"|b	c #8B842B",
+"1b	c #32300F",
+"2b	c #3D3A12",
+"3b	c #DCD143",
+"4b	c #FCF058",
+"5b	c #E4DB5A",
+"6b	c #514F31",
+"7b	c #2F2E27",
+"8b	c #262626",
+"9b	c #676443",
+"0b	c #F7ED6C",
+"ab	c #D2C253",
+"bb	c #F3DA6C",
+"cb	c #998D5A",
+"db	c #62604C",
+"eb	c #67664E",
+"fb	c #6C6A52",
+"gb	c #767355",
+"hb	c #84805A",
+"ib	c #918D5E",
+"jb	c #9F9A63",
+"kb	c #A8A367",
+"lb	c #B2AC6A",
+"mb	c #C5BD72",
+"nb	c #CEC576",
+"ob	c #DAD279",
+"pb	c #FDF48E",
+"qb	c #FEDD45",
+"rb	c #FBEB58",
+"sb	c #818131",
+"tb	c #E3E356",
+"ub	c #CDCC4C",
+"vb	c #313112",
+"wb	c #27270E",
+"xb	c #D4D14D",
+"yb	c #78762C",
+"zb	c #DEDB50",
+"Ab	c #A8A43B",
+"Bb	c #26260D",
+"Cb	c #D7D34B",
+"Db	c #E7E350",
+"Eb	c #3A3914",
+"Fb	c #EDDF4B",
+"Gb	c #D7BC3C",
+"Hb	c #FCEA4F",
+"Ib	c #C3BD41",
+"Jb	c #24230C",
+"Kb	c #A5A137",
+"Lb	c #A7A236",
+"Mb	c #908A2C",
+"Nb	c #27250E",
+"Ob	c #D5CB50",
+"Pb	c #FCF161",
+"Qb	c #F0E75F",
+"Rb	c #4C4B2F",
+"Sb	c #313028",
+"Tb	c #35342A",
+"Ub	c #3B3A2E",
+"Vb	c #414031",
+"Wb	c #464532",
+"Xb	c #4C4A36",
+"Yb	c #504F38",
+"Zb	c #57553B",
+"`b	c #5E5C3E",
+" c	c #6C6943",
+".c	c #8F8A4F",
+"+c	c #F8EE6E",
+"@c	c #DACA56",
+"#c	c #EAD167",
+"$c	c #FEE375",
+"%c	c #ECD573",
+"&c	c #E9DC71",
+"*c	c #F1E776",
+"=c	c #FAF079",
+"-c	c #FDF48D",
+";c	c #FDF48F",
+">c	c #FDEF79",
+",c	c #FCDF50",
+"'c	c #F9F760",
+")c	c #8D8D36",
+"!c	c #D7D751",
+"~c	c #D9D850",
+"{c	c #4A4A1B",
+"]c	c #52511E",
+"^c	c #51501E",
+"/c	c #E4E04F",
+"(c	c #5B5920",
+"_c	c #B3B13E",
+":c	c #7E7A29",
+"<c	c #CBB239",
+"[c	c #F3D144",
+"}c	c #FDE44C",
+"|c	c #CFC845",
+"1c	c #F2EA4E",
+"2c	c #464416",
+"3c	c #DAD245",
+"4c	c #9B942F",
+"5c	c #050501",
+"6c	c #28260C",
+"7c	c #2C2B0D",
+"8c	c #383611",
+"9c	c #4C4A1C",
+"0c	c #6C6932",
+"ac	c #D7CD55",
+"bc	c #F9EE61",
+"cc	c #9F9948",
+"dc	c #AAA44D",
+"ec	c #B5AE50",
+"fc	c #C1B955",
+"gc	c #CBC459",
+"hc	c #D6CD5D",
+"ic	c #E0D761",
+"jc	c #EBE165",
+"kc	c #F6EC6A",
+"lc	c #FCF16D",
+"mc	c #FAF06F",
+"nc	c #E0D45A",
+"oc	c #E2CB63",
+"pc	c #FFE578",
+"qc	c #FDEC79",
+"rc	c #FDF27A",
+"sc	c #FEF6A8",
+"tc	c #FDF5AB",
+"uc	c #FDE961",
+"vc	c #FAF05A",
+"wc	c #98983A",
+"xc	c #CBCB4D",
+"yc	c #C9C84A",
+"zc	c #3F3F17",
+"Ac	c #9A9838",
+"Bc	c #4B4A1B",
+"Cc	c #D9D64D",
+"Dc	c #D9D54C",
+"Ec	c #8E8C31",
+"Fc	c #C9C546",
+"Gc	c #C9C545",
+"Hc	c #8F8C31",
+"Ic	c #61581A",
+"Jc	c #7E6C22",
+"Kc	c #A18A2E",
+"Lc	c #BDA235",
+"Mc	c #CFB23A",
+"Nc	c #B09B33",
+"Oc	c #7D7929",
+"Pc	c #353412",
+"Qc	c #A39E35",
+"Rc	c #B6AF37",
+"Sc	c #767124",
+"Tc	c #837D28",
+"Uc	c #8F882C",
+"Vc	c #9C9530",
+"Wc	c #A7A133",
+"Xc	c #CEC53E",
+"Yc	c #DAD142",
+"Zc	c #E6DC45",
+"`c	c #F3E84A",
+" d	c #FCF157",
+".d	c #FCF15E",
+"+d	c #FCF25F",
+"@d	c #FCF265",
+"#d	c #FCF266",
+"$d	c #FCF267",
+"%d	c #FAF071",
+"&d	c #E7DB61",
+"*d	c #DBC75D",
+"=d	c #FDE273",
+"-d	c #FEEA79",
+";d	c #FDF179",
+">d	c #FCF380",
+",d	c #FEF6A9",
+"'d	c #FEF5AC",
+")d	c #FBE452",
+"!d	c #949439",
+"~d	c #B4B342",
+"{d	c #343413",
+"]d	c #28280F",
+"^d	c #D6D34D",
+"/d	c #8A8732",
+"(d	c #616023",
+"_d	c #E1DE50",
+":d	c #A8A53C",
+"<d	c #949134",
+"[d	c #777429",
+"}d	c #26250D",
+"|d	c #DFD94D",
+"1d	c #BCB741",
+"2d	c #25240A",
+"3d	c #28260A",
+"4d	c #141105",
+"5d	c #1B1708",
+"6d	c #171407",
+"7d	c #454317",
+"8d	c #424015",
+"9d	c #9F9A33",
+"0d	c #FCF153",
+"ad	c #FCF05C",
+"bd	c #FCF15D",
+"cd	c #FCF25E",
+"dd	c #FCF160",
+"ed	c #FCF264",
+"fd	c #FCF268",
+"gd	c #FBF172",
+"hd	c #EEE46A",
+"id	c #D3C355",
+"jd	c #FBE273",
+"kd	c #FEE879",
+"ld	c #FDF079",
+"md	c #FDF27B",
+"nd	c #FDF59D",
+"od	c #FEF5AB",
+"pd	c #FEDF42",
+"qd	c #F9F45E",
+"rd	c #868633",
+"sd	c #808030",
+"td	c #F5F35C",
+"ud	c #B6B544",
+"vd	c #5F5E23",
+"wd	c #55541F",
+"xd	c #C0BD45",
+"yd	c #3B3A15",
+"zd	c #716F28",
+"Ad	c #5F5E22",
+"Bd	c #6B6926",
+"Cd	c #84812E",
+"Dd	c #E9E450",
+"Ed	c #28270E",
+"Fd	c #85832D",
+"Gd	c #393713",
+"Hd	c #1B1A07",
+"Id	c #494614",
+"Jd	c #040400",
+"Kd	c #89852D",
+"Ld	c #EDE74E",
+"Md	c #9D9833",
+"Nd	c #DCD446",
+"Od	c #FCF14E",
+"Pd	c #FCF255",
+"Qd	c #FCF25A",
+"Rd	c #FCF15C",
+"Sd	c #FCF06D",
+"Td	c #FCF373",
+"Ud	c #F5EB6F",
+"Vd	c #D0C253",
+"Wd	c #F6DD70",
+"Xd	c #FFE67A",
+"Yd	c #FDF07A",
+"Zd	c #FDF185",
+"`d	c #FBE855",
+" e	c #75752D",
+".e	c #3E3E18",
+"+e	c #BDBD48",
+"@e	c #F6F65D",
+"#e	c #D5D450",
+"$e	c #B8B745",
+"%e	c #999839",
+"&e	c #4E4D1D",
+"*e	c #9C9A39",
+"=e	c #E7E451",
+"-e	c #E2DF50",
+";e	c #504F1C",
+">e	c #8C8930",
+",e	c #F5EF54",
+"'e	c #313011",
+")e	c #E9E54E",
+"!e	c #989231",
+"~e	c #857A25",
+"{e	c #524615",
+"]e	c #413812",
+"^e	c #342D0F",
+"/e	c #4D4216",
+"(e	c #837728",
+"_e	c #ABA439",
+":e	c #918C2F",
+"<e	c #5C591D",
+"[e	c #FCF253",
+"}e	c #FCF258",
+"|e	c #FCF25B",
+"1e	c #FCF25C",
+"2e	c #FCF260",
+"3e	c #FCF162",
+"4e	c #F9F071",
+"5e	c #D4C656",
+"6e	c #F0D86E",
+"7e	c #FFE67B",
+"8e	c #FDEF7B",
+"9e	c #FDEE71",
+"0e	c #FCDC4D",
+"ae	c #ECEC5A",
+"be	c #4D4D1D",
+"ce	c #323213",
+"de	c #3A3A16",
+"ee	c #424219",
+"fe	c #D9D64F",
+"ge	c #F7F459",
+"he	c #848330",
+"ie	c #2D2D10",
+"je	c #959234",
+"ke	c #E6E351",
+"le	c #82802D",
+"me	c #393814",
+"ne	c #EFEA52",
+"oe	c #F6F155",
+"pe	c #F7F151",
+"qe	c #D9C53E",
+"re	c #EAC941",
+"se	c #FEE14B",
+"te	c #F9F150",
+"ue	c #FBF051",
+"ve	c #FBF257",
+"we	c #FCF259",
+"xe	c #FCF25D",
+"ye	c #F9EF70",
+"ze	c #DACE59",
+"Ae	c #E9D26B",
+"Be	c #FEE379",
+"Ce	c #FDEE7B",
+"De	c #FDF27D",
+"Ee	c #FEF6AA",
+"Fe	c #FDEB5D",
+"Ge	c #FAEC58",
+"He	c #F3F45E",
+"Ie	c #ABAB42",
+"Je	c #3E3E17",
+"Ke	c #575620",
+"Le	c #DDDA4F",
+"Me	c #4F4E1C",
+"Ne	c #3C3B15",
+"Oe	c #8B8932",
+"Pe	c #BCB943",
+"Qe	c #ECE853",
+"Re	c #F1ED54",
+"Se	c #E2DF4F",
+"Te	c #DEDA4D",
+"Ue	c #F8F152",
+"Ve	c #DFCD42",
+"We	c #E3C53F",
+"Xe	c #FFDE4A",
+"Ye	c #FBF153",
+"Ze	c #C1BB3E",
+"`e	c #E8E14A",
+" f	c #FBF255",
+".f	c #FBF157",
+"+f	c #FBF258",
+"@f	c #FCF374",
+"#f	c #FBF072",
+"$f	c #E1D55E",
+"%f	c #E2CD67",
+"&f	c #FDE278",
+"*f	c #FFE57C",
+"=f	c #FFE67C",
+"-f	c #FDEC7C",
+";f	c #FCF381",
+">f	c #FDF59E",
+",f	c #FEF6AD",
+"'f	c #FEE74A",
+")f	c #FCE04F",
+"!f	c #F9F75F",
+"~f	c #EEEE5C",
+"{f	c #0F0F06",
+"]f	c #50501E",
+"^f	c #636224",
+"/f	c #76762C",
+"(f	c #BAB744",
+"_f	c #F4F057",
+":f	c #E4D345",
+"<f	c #DCC03D",
+"[f	c #FCEF52",
+"}f	c #615E1F",
+"|f	c #FBF259",
+"1f	c #FCF062",
+"2f	c #FCF36A",
+"3f	c #FBF075",
+"4f	c #E7DC65",
+"5f	c #DCC960",
+"6f	c #FCE177",
+"7f	c #FEEB7E",
+"8f	c #FDF59F",
+"9f	c #FEE540",
+"0f	c #FED448",
+"af	c #FAF15A",
+"bf	c #383815",
+"cf	c #47471B",
+"df	c #6A6A28",
+"ef	c #7C7C2F",
+"ff	c #888833",
+"gf	c #949438",
+"hf	c #A1A03C",
+"if	c #ADAC41",
+"jf	c #BAB945",
+"kf	c #C6C54A",
+"lf	c #D3D14F",
+"mf	c #DFDE53",
+"nf	c #EBEA57",
+"of	c #F7F65B",
+"pf	c #ECDD4A",
+"qf	c #D5BD3B",
+"rf	c #FBD747",
+"sf	c #FCEB4F",
+"tf	c #C8C141",
+"uf	c #6C6923",
+"vf	c #6D6924",
+"wf	c #E4DC4A",
+"xf	c #BEB83D",
+"yf	c #FBF057",
+"zf	c #FAF259",
+"Af	c #FDF375",
+"Bf	c #FCF276",
+"Cf	c #EDE16B",
+"Df	c #D4C45B",
+"Ef	c #FBE277",
+"Ff	c #FFE67E",
+"Gf	c #FEEA7E",
+"Hf	c #FDF289",
+"If	c #FDF4A3",
+"Jf	c #FDF4A5",
+"Kf	c #FDF5A6",
+"Lf	c #FDF5A7",
+"Mf	c #FDF5AA",
+"Nf	c #FDF5AD",
+"Of	c #FDD447",
+"Pf	c #FBE553",
+"Qf	c #F8F960",
+"Rf	c #BEBE49",
+"Sf	c #D8D752",
+"Tf	c #E4E357",
+"Uf	c #F0F05C",
+"Vf	c #F3E64F",
+"Wf	c #D2BA3B",
+"Xf	c #F7D445",
+"Yf	c #FDE94E",
+"Zf	c #BAB43C",
+"`f	c #434116",
+" g	c #656220",
+".g	c #FCF164",
+"+g	c #FDF374",
+"@g	c #FDF376",
+"#g	c #F2E66F",
+"$g	c #D1C159",
+"%g	c #F9E077",
+"&g	c #FFE57D",
+"*g	c #FEE97E",
+"=g	c #FDF5A1",
+"-g	c #FDF4A2",
+";g	c #FEF5AD",
+">g	c #FDF07B",
+",g	c #FEE441",
+"'g	c #F8EE51",
+")g	c #D5BE3B",
+"!g	c #FDE54C",
+"~g	c #313010",
+"{g	c #D8D144",
+"]g	c #FDF377",
+"^g	c #F7EC74",
+"/g	c #D2C15B",
+"(g	c #F5DB75",
+"_g	c #FFE57E",
+":g	c #FEE87F",
+"<g	c #FCF27E",
+"[g	c #FCF280",
+"}g	c #FCF382",
+"|g	c #FEF4AE",
+"1g	c #FDEA67",
+"2g	c #FEE143",
+"3g	c #FBE856",
+"4g	c #F8F051",
+"5g	c #D9C43E",
+"6g	c #E9CA41",
+"7g	c #FEE04A",
+"8g	c #959031",
+"9g	c #FBF256",
+"0g	c #FBF158",
+"ag	c #FCF275",
+"bg	c #FCF277",
+"cg	c #F8EE75",
+"dg	c #D5C55E",
+"eg	c #F0D772",
+"fg	c #FFE67F",
+"gg	c #FFE780",
+"hg	c #FDF180",
+"ig	c #FDF39B",
+"jg	c #FDF29E",
+"kg	c #FDF2A0",
+"lg	c #FEF2A0",
+"mg	c #FEF1A2",
+"ng	c #FEF1A4",
+"og	c #FEF0A5",
+"pg	c #FEF0A6",
+"qg	c #FEF0A7",
+"rg	c #FEEFA9",
+"sg	c #FEEEAB",
+"tg	c #FEEEAD",
+"ug	c #FEEEAE",
+"vg	c #FEEEB0",
+"wg	c #FEEDAC",
+"xg	c #FEDB58",
+"yg	c #FCDC4E",
+"zg	c #F8F052",
+"Ag	c #E0CC43",
+"Bg	c #E3C43F",
+"Cg	c #D5CD45",
+"Dg	c #A09B34",
+"Eg	c #FBF25A",
+"Fg	c #FCF15F",
+"Gg	c #FBF162",
+"Hg	c #FBF063",
+"Ig	c #FBF164",
+"Jg	c #FBF166",
+"Kg	c #FBF167",
+"Lg	c #FAEE77",
+"Mg	c #D9CA62",
+"Ng	c #EBD371",
+"Og	c #FFE680",
+"Pg	c #FDF18C",
+"Qg	c #FDF18E",
+"Rg	c #FDF08E",
+"Sg	c #FDF090",
+"Tg	c #FDEF92",
+"Ug	c #FDEE93",
+"Vg	c #FDEE94",
+"Wg	c #FDED95",
+"Xg	c #FDED96",
+"Yg	c #FDED97",
+"Zg	c #FDEC98",
+"`g	c #FDEC9A",
+" h	c #FDEB9B",
+".h	c #FDEB9D",
+"+h	c #FDEB9E",
+"@h	c #FEEA9C",
+"#h	c #FEE898",
+"$h	c #FEE794",
+"%h	c #FEE690",
+"&h	c #FEE58A",
+"*h	c #FEE486",
+"=h	c #FEE381",
+"-h	c #FEE17C",
+";h	c #FEDF71",
+">h	c #FEDE6C",
+",h	c #FEDD66",
+"'h	c #FEDB60",
+")h	c #FED955",
+"!h	c #FED74E",
+"~h	c #F9F252",
+"{h	c #E6D344",
+"]h	c #DDC13E",
+"^h	c #B8B23B",
+"/h	c #FAF153",
+"(h	c #FAF053",
+"_h	c #FAF155",
+":h	c #FAF157",
+"<h	c #FAF057",
+"[h	c #FAF158",
+"}h	c #FAF159",
+"|h	c #FBF15A",
+"1h	c #FBF15B",
+"2h	c #FBF15D",
+"3h	c #FBF15E",
+"4h	c #FBF25F",
+"5h	c #FBF15F",
+"6h	c #FBF161",
+"7h	c #FCF063",
+"8h	c #FCF167",
+"9h	c #FCF175",
+"0h	c #FDF177",
+"ah	c #FBEE78",
+"bh	c #DDCE68",
+"ch	c #E7D06F",
+"dh	c #FFE782",
+"eh	c #FDEC82",
+"fh	c #FDED81",
+"gh	c #FDEC83",
+"hh	c #FDEB85",
+"ih	c #FDEA86",
+"jh	c #FDE988",
+"kh	c #FDE888",
+"lh	c #FDE88A",
+"mh	c #FDE78B",
+"nh	c #FDE78C",
+"oh	c #FEE589",
+"ph	c #FEE485",
+"qh	c #FEE383",
+"rh	c #FEE37F",
+"sh	c #FEE27B",
+"th	c #FEE177",
+"uh	c #FEDF6F",
+"vh	c #FEDE6B",
+"wh	c #FEDD67",
+"xh	c #FEDC62",
+"yh	c #FEDB5E",
+"zh	c #FEDA59",
+"Ah	c #FED954",
+"Bh	c #FED84F",
+"Ch	c #FED64A",
+"Dh	c #FBE754",
+"Eh	c #F8F95F",
+"Fh	c #ECDA48",
+"Gh	c #FCEF50",
+"Hh	c #D2CA44",
+"Ih	c #FAF24F",
+"Jh	c #FBF159",
+"Kh	c #FCF15B",
+"Lh	c #FCF166",
+"Mh	c #FCF06C",
+"Nh	c #FCEF6E",
+"Oh	c #FCED6F",
+"Ph	c #FCED71",
+"Qh	c #FCEC71",
+"Rh	c #FDEA73",
+"Sh	c #FDE974",
+"Th	c #FDE875",
+"Uh	c #FDE876",
+"Vh	c #FDE676",
+"Wh	c #FDE579",
+"Xh	c #FCE37A",
+"Yh	c #E7D06D",
+"Zh	c #E9D06B",
+"`h	c #FFE26D",
+" i	c #FEDE69",
+".i	c #FEDE67",
+"+i	c #FEDD64",
+"@i	c #FEDC61",
+"#i	c #FED957",
+"$i	c #FED74B",
+"%i	c #00D648",
+"&i	c #F2E14B",
+"*i	c #D3B73A",
+"=i	c #FBEC4F",
+"-i	c #FBF056",
+";i	c #FBEF58",
+">i	c #FBF059",
+",i	c #FBF05A",
+"'i	c #FCEF5F",
+")i	c #FCED5F",
+"!i	c #FCEC60",
+"~i	c #FCEB61",
+"{i	c #FCEA61",
+"]i	c #FDE963",
+"^i	c #FDE763",
+"/i	c #FDE665",
+"(i	c #FDE666",
+"_i	c #FDE467",
+":i	c #FDE368",
+"<i	c #FDE269",
+"[i	c #FDE169",
+"}i	c #FDDF67",
+"|i	c #FDDE67",
+"1i	c #FDDD66",
+"2i	c #FEDC63",
+"3i	c #FEDC5F",
+"4i	c #FEDB5D",
+"5i	c #FEDB5A",
+"6i	c #FEDA58",
+"7i	c #FED956",
+"8i	c #FED953",
+"9i	c #FED851",
+"0i	c #FED948",
+"ai	c #FAF25C",
+"bi	c #F9F454",
+"ci	c #F9F353",
+"di	c #F7E74E",
+"ei	c #D4B83A",
+"fi	c #FCEA4E",
+"gi	c #FBEE50",
+"hi	c #FBEC50",
+"ii	c #FBEB51",
+"ji	c #FBEA52",
+"ki	c #FCE952",
+"li	c #FCE753",
+"mi	c #FCE553",
+"ni	c #FCE556",
+"oi	c #FCE455",
+"pi	c #FCE257",
+"qi	c #FCE057",
+"ri	c #FDE058",
+"si	c #FDDD58",
+"ti	c #FDDB58",
+"ui	c #FDDA57",
+"vi	c #FEDA56",
+"wi	c #FEDA55",
+"xi	c #FED952",
+"yi	c #FED74F",
+"zi	c #FED74D",
+"Ai	c #FED74C",
+"Bi	c #FED549",
+"Ci	c #FBEA56",
+"Di	c #F8F85F",
+"Ei	c #F9F558",
+"Fi	c #F9F458",
+"Gi	c #F9F557",
+"Hi	c #F9F556",
+"Ii	c #F8EA4F",
+"Ji	c #D9BD3D",
+"Ki	c #EDCB43",
+"Li	c #FDE74D",
+"Mi	c #FBEF50",
+"Ni	c #FBEC4E",
+"Oi	c #FCE94D",
+"Pi	c #FCE74C",
+"Qi	c #FCE54C",
+"Ri	c #FCE34C",
+"Si	c #FCE24C",
+"Ti	c #FCE14B",
+"Ui	c #FCDF4B",
+"Vi	c #FDD74B",
+"Wi	c #FED84C",
+"Xi	c #FED64B",
+"Yi	c #FCE150",
+"Zi	c #F9F75C",
+"`i	c #F8F75B",
+" j	c #FAED51",
+".j	c #E9CA42",
+"+j	c #F2CF44",
+"@j	c #FEE14A",
+"#j	c #FCE34D",
+"$j	c #FCE04C",
+"%j	c #FDDB4A",
+"&j	c #F9F55D",
+"*j	c #F8F85D",
+"=j	c #F8F75D",
+"-j	c #FAF358",
+";j	c #FAF255",
+">j	c #FAF054",
+",j	c #FAEE53",
+"'j	c #FAEC52",
+")j	c #FBEA51",
+"!j	c #FBE950",
+"~j	c #FBE74F",
+"{j	c #FCE44E",
+"]j	c #FCE24E",
+"^j	c #FCE04D",
+"/j	c #FCDD4B",
+"(j	c #FEDA49",
+"_j	c #F9F15A",
+":j	c #F9F65C",
+"<j	c #FAF257",
+"[j	c #FAF056",
+"}j	c #FAEE55",
+"|j	c #FBEB53",
+"1j	c #FBE851",
+"2j	c #FCE650",
+"3j	c #FCE550",
+"4j	c #FFDA49",
+"5j	c #FAEC57",
+"6j	c #F9F259",
+"7j	c #FAEF57",
+"8j	c #FBED56",
+"9j	c #FBEC54",
+"0j	c #FBE953",
+"aj	c #FCE752",
+"bj	c #FCE651",
+"cj	c #FCE450",
+"dj	c #FCE24F",
+"ej	c #FCDC4B",
+"fj	c #FFD947",
+"gj	c #FBE653",
+"hj	c #F8F75E",
+"ij	c #F9F65E",
+"jj	c #F9F35B",
+"kj	c #F9F059",
+"lj	c #FAEE58",
+"mj	c #FBEA55",
+"nj	c #FBE854",
+"oj	c #FBE250",
+"pj	c #FCE14F",
+"qj	c #FCDF4D",
+"rj	c #FCDE4E",
+"sj	c #FBE351",
+"tj	c #FBE14F",
+"uj	c #FCDF4E",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          . + + @ . # $ # + + +                                                                                     ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                          % & $ + + . . + + + + + # . . * # + # # . # # + + + + +                                                                                   ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                          = . % % # + + . + + + + # # . * # + # # + # # + + + + + + + + + + + + + + + + + + + + .                                                                                   ",
+"                                                                                                                                                                                                                                                                                                                                                                                          $ - % . . + & # @ . . + # # + # # + # # + # # + + + + + + + + + + + + + + + + + + + + + + + + + + $ $ $ $ $ $ + + + $ .                                                                                   ",
+"                                                                                                                                                                                                                                                                                                                                                          . & ; . @ . # + + . . * # # + # # + # # + # & + + + + + + + + + + + + + + + + + + + + + + + + + + $ $ $ $ $ $ $ $ $ $ > > > > > > > > > > > > > > + + .                                                                                   ",
+"                                                                                                                                                                                                                                                                                                                            $ $ + + % . @ + + . % + # + + # & + # + + & & + + + + + + + + + + + + + + + + + + + + + + + + + + $ $ $ $ $ $ $ $ $ > > > > > > > > > > > > > > > , , , , , ' ' ) ! ~ { ] ^ > > + + +                                                                                   ",
+"                                                                                                                                                                                                                                                                                            - % & . + + + . + + % + # + + # & $ # + . # # . + + + % @ @ + + + + + + + + + + + + + + + + + + $ $ $ $ $ $ $ $ $ $ > / / / / / > / > > > > > > > , , , , , , , ( ! ^ _ _ : < [ [ } | 1 2 3 4 5 5 5 6 5 5 7 > > + & .                                                                                   ",
+"                                                                                                                                                                                                                                                            . 8 . + $ # $ # + + + $ # + + # # + # . . # # + + + + + + + + + + + + + + + . + 9 9 0 9 0 + + + $ $ $ & & & & & & & & / / / / / / / / / / / / / / a a , a a a a , b c d e f g h i j k l m n o p q q r s t t t t u t v u u w x w w w w y 6 z A B C D + #                                                                                 ",
+"                                                                                                                                                                                                                            ; & $ % + . + + + + + $ # . . * # + # # . # # + + + + + + + + + + + + + + + + + + + + + + + + + + $ $ & & & $ 0 E F G F E ( H / / / / / / / / / a a a a a a a a I J K L M N O P Q R S T U V W X Y Z Y ` ` `  .` .. . . .+.s +.+.+.@.@.@.#.#.$.u u u %.&.&.x x *.*.*.*.=.=.-.;.H >.+ + +                                                                                 ",
+"                                                                                                                                                                                            ,.. & % # % % . + + + + # # . * # + # # + # # + + + + + + + + + + + + + + + + + + + + + + + + + + $ & & & & & & & & & / / / / / / / / / / / > , '.F F F F ) a a b J ).!.~.{.].^./.(._.:.<.[.}.|.1.1.1.2.1.3.1.3.4.4.4.4.3.3.3.5.` 6............... .7.7.7.8.7.9.9.9.9.@.0.0.u &.&.&.6 w w w x w w w a.a.a.b.{ > H . + #                                                                                 ",
+"                                                                                                                                                            % - % $ . + & # @ . . + # # + * # + # # + # # + + + + + + + + + + + + + + + + + + + + + + + + + + $ & & & & & & & & & / / / / / / / / / / / / / a a a a a a a a b b ).!.c.c.d.e.f.'.F F F g.h.i.j.k.k.l.k.l.m.l.n.o.p.o.o.o.o.q.r.s.s.s.s.s.s.4.4.4.t.t.5.5.5.u.u.u.u.u.u.v.v.v.w.7. .+.+.+.@.+.+.@.@.x.y.#.#.z.z.w u z.A.B.A.A.A.A.a.a.a.b.C.B H + + +                                                                                 ",
+"                                                                                                                            . & @ . @ $ # + + . . * # # + # # + # # + # & + + + + + % $ + + + + + + + + + + + + + + + + + + + $ & & & & & & & & & / / / / / / / / / / / / / a a a a a a a a I b D.!.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.R.S.T.T.T.U.V.W.F F X.Y.k.Z.`.Z. +n. +n.n.n.n.o.n..+.+.+.+++++q.q.q.q.q.q.t.t.t.4.4.3.3.3.u.6.6.6.@+@+#+#+#+......$++.@.$+$+x.%+x.%+y.#.z.A.z.u u z.A.A.A.A.A.A.a.a.a.b.&+A H + C & $                                                                               ",
+"                                                                                              $ $ + . @ . @ + + . % + # + + # & + # + + & & + + + + + + + + + + + + + + + + + + 9 *+9 =+*+0 @ $ & & & & & & & & & / / / / / / / / / / / / / a a a a a a a I b J D.-+;+F.>+,+'+)+!+~+{+]+^+/+(+_+:+<+<+<+[+:+}+[+[+}+|+[+|+|+1+|+|+|+2+2+2+3+4+5+F F X.(.`.`.`.`.6+7+6+7+7+7+n.n.p.o.o.o.o.++o.o.r.r.8+8+9+8+8+9+0+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.+.$+$+x.x.a+x.y.#.z.z.z.u u z.A.A.A.A.A.A.a.a.a.b.b+;.> + + + +                                                                               ",
+"                                                                        c+. % + + % + # + + # & $ # + + # # + + + + + + + + + + + + + + + + + + + + + + + + + $ & & & & & & & 0 E F F F F =+> / / / / / / / a a a a a a d+e+e+f+g+-+;+h+i+j+k+l+m+n+o+p+q+r+s+t+u+u+v+w+w+x+x+y+z+A+B+C+D+C+E+B+E+E+E+E+F+<+[+[+[+}+G+G+1+1+1+1+1+1+H+H+H+I+J+K+F F X.L+ +M+N+M+Z.Z.Z. + +Z.O+P+P+P+P+p.r.o.8+r.Q+s.9+8+8+8+8+9+9+4.4.4.4.6.6.@+@+@+@+#+#+.. .....+.s +.$+$+x.x.x.y.y.#.z.z.z.u u z.A.A.B.A.A.a.R+a.a.y b.S+B H . + .                                                                               ",
+"                                                                        % . + + + + + + + + + + + + + + + + + + + + + + + + + + & & & & & & & & & & / / / / / / / / / / / / a a G F F F E E e+f+g+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@&@*@&@=@=@-@;@>@,@'@)@!@~@{@]@^@/@v+(@_@:@<@[@A+A+B+B+}@B+|@B+|@|@|@|@1@2@G+G+G+G+[+[+|+|+1+|+|+|+|+|+|+3@4@5@'.F 6@7@Z.8@M+9@Z.Z. +k. +`.O+P+0@P+P+o.8+o.o.r.r.8+8+8+8+8+8+9+4.3.4.4.3.` 6.#+@+@+#+a@#+$+....$+@.+.$+$+$+x.x.x.y.#.t z.z.u v u z.A.A.A.A.A.a.a.a.b@R+c@d@B H + + + @                                                                             ",
+"                                                                        @ + + + + + + + + + + + & & & & & & & & & & / / / / / / / / / / / / a a a d+d+d+e+e+e+f+e@f@g@h@i@j@k@l@m@n@o@p@q@r@s@t@u@v@w@w@x@t@y@z@A@B@C@D@E@F@G@H@I@J@J@K@L@M@N@>@>@,@'@O@O@P@Q@R@S@T@U@V@W@X@Y@Y@Z@`@B+C+C+C+C+B+C+ # #.#E+E+E+E+<+[+F+F+F+F+F++#+#@#|+|+@###$#%#;.F F &#Z.8@M+M+Z.Z. + +Z.Z.P+P+P+P+P+o.o.o.o.r.r.8+8+8+8+8+8+9+4.@+4.4.6...@+@+@+@+#+#+#+......$++.+.$+$+$+x.x.x.y.#.#.z.z.w u z.A.B.A.A.A.A.a.a.a.a.y b.*#A =#+ H + +                                                                             ",
+"                                                                        . + + + + & / / / / / / / / / / / / a a d+d+d+d+e+e+e+-#;#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#}#|#1#2#3#3#4#5#6#7#8#9#0#a#b#c#d#d#e#f#g#h#h#i#i#C@j#k#l#m#H@H@n#o#o#p#p#N@N@>@>@q#r#!@{@{@s#t#^@u#v#w#x#y#z#A#B#C#C#D#D# # # # # # #.#E+F+E+E+[+|+F++#F+F++#E#+#|+|+|+@#F#G#H#^ F F I# +8@M+M+Z.Z.n. +Z.O+0@P+P+P+P+o.o.o.o.r.r.8+8+8+8+8+8+9+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.@.$+$+x.%+x.%+y.#.z.A.z.u u z.A.A.A.A.A.A.a.a.a.a.y y J#S+B H + + +                                                                             ",
+"                                                                        @ # + + > / d+e+e+e+e+-#K#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`#`# $.$+$@$#$$$%$%$&$*$*$=$-$;$>$,$'$)$3#3#!$~${$]$^$9#0#/$($c#_$:$<$[$}$|$|$1$2$3$4$5$5$G@6$7$8$*@9$0$a$b$c$d$e$f$'@g$h$i$j$j$^@k$w#w#x#z#z#B#B#C#C#D#D# # # # # # #.#E+E+E+E+[+[+F+F+F+F++#+#+#|+|+|+@#l$m$n$~ F o$X.p$Z.M+Z.O+Z. + +Z.O+P+P+P+P+P+o.o.o.o.r.r.8+8+9+8+8+9+0+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.+.$+$+x.x.a+x.y.#.z.z.z.u u z.A.A.A.A.A.A.a.a.b@a.y R+c@7 A C + % % &                                                                           ",
+"                                                                        + # + + q$r$s$t$u$v$w$x$x$y$y$z$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O$P$.$Q$$$$$%$%$&$*$R$S$T$T$>$U$U$V$W$W$X$Y$Z$`$ %9#.%+%@%#%$%%%&%f#y@h#*%i#B@B@D@=%F@G@G@-%8$9$0$a$b$b$d$d$;%,@)@h$i$s#>%^@^@v#v#x#y#z#[@A+C#C#,%'%D# # # # # # #E+<+E+E+<+}+[+F+F+F+F++#+#|+S.|+|+2+)%!%~%W.F o$X.{%]%M+Z.Z.Z. + +Z.O+P+P+P+P+p.r.o.8+r.Q+s.9+8+8+8+8+9+9+4.4.4.4.6.6.@+@+@+@+#+#+.. .....+.s +.$+$+x.x.x.y.y.#.z.z.z.u u z.A.A.B.A.A.a.R+a.a.y b.R+b.b+{ B + + + +                                                                           ",
+"                                                                        + + + + ^%/%(%(%_%:%<%[%}%}%|%1%A$B$C$2%3%F$G$H$I$J$L$L$N$N$O$.$4%5%6%7%8%9%0%0%=$=$;$;$>$'$'$a%b%c%!$Y$d%e%f%g%.%h%i%j%$%&%&%g#k%h#*%i#B@C@D@=%F@G@l%-%J@9$a$a$b$c$e$e$f$'@g$h$i$s#j$^@/@v#w#x#y#z#A#B#C#m%,%D# #.# #.# # #.#F+E+E+E+<+[+F+F+F+F+F++#+#|+|+|+|+2+9@n%o%p%F F X.q%9@9@Z.Z. +k. +`.O+P+0@P+P+o.8+o.o.r.r.8+8+8+8+8+8+9+4.3.4.4.3.` 6.#+@+@+#+a@#+$+....$+@.+.$+$+$+x.x.x.y.#.t z.z.u v u z.A.A.A.A.A.a.a.a.a.y y R+y b.r%A H + + + -                                                                         ",
+"                                                                        + + + + s%t%(%(%_%:%<%[%}%u%|%1%A$v%w%3%3%G$H$I$I$K$L$L$N$O$x%x%y%Q$z%A%A%&$&$B%C%D%E%F%G%H%I%a%b%J%!$K%L%M%N%O%P%Q%R%S%%%&%T%g#h#*%i#B@B@j#D@U%F@G@-%-%9$9$a$a$b$d$d$f$f$g$g$h$V%s#^@^@k$v#x#z#z#W%B#X%C#C#D#D# # # # # # #.#E+E+E+E+<+[+F+F+F+F+F++#+#@#|+|+@#M+2+Y%Z%`%'.F X. & +M+Z.Z. + +Z.Z.P+P+P+P+P+o.o.o.o.r.r.8+8+8+8+8+8+9+4.@+4.4.6...@+@+@+@+#+#+#+......$++.+.$+$+$+x.x.x.y.#.#.z.z.w u z.A.B.A.A.A.A.a.a.a.a.y y R+y c@.&+&B + C + +                                                                         ",
+"                                                                        . + + / @&#&(%(%$&<%[%}%}%|%%&&&*&=&2%3%-&-&;&;&J$K$>&,&'&)&!&x%~&Q$z%A%{&&$*$C%]&E%E%G%G%H%a%c%c%J%^&Y$/&(&_&:&P%<&[&}&%%&%|&g#h#*%i#B@C@j#=%U%l%l%-%1&K@K@a$b$2&d$e$f$;%g$3&i$V%j$^@/@k$w#x#y#z#W%B#C#C#C#D#D# # # # # # #.#E+F+E+E+[+|+F++#F+F++#E#+#|+|+|+@#2+2+4&5&6&7&F F 8& +M+Z.Z.n. +Z.O+0@P+P+P+P+o.o.o.o.r.r.8+8+8+8+8+8+9+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.@.$+$+x.%+x.%+y.#.z.A.z.u u z.A.A.A.A.A.A.a.a.a.a.y y b@R+R+9&C.B >.+ + +                                                                         ",
+"                                                                        + + % / 0&#&(%a&b&c&d&[%u%%&&&e&*&w%2%3%F$f&;&I$K$K$>&,&'&!&x%y%~&z%z%A%g&&$*$C%]&E%F%G%H%I%2#b%c%!$h&K%i&j&k&:&l&<&m&e#&%T%|&h#*%i#C@B@j#D@U%F@6$-%-%9$&@L@a$b$2&d$f$f$n&g$h$i$V%/@^@k$v#y#x#z#W%o&C#C#C#C#D#D# # # # # # #.#E+E+E+E+[+[+F+F+F+F++#+#+#|+|+|+@#2+2+p&q&r&^ F F s&k.Z.O+Z. + +Z.O+P+P+P+P+P+o.o.o.o.r.r.8+8+9+8+8+9+0+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.+.$+$+x.x.a+x.y.#.z.z.z.u u z.A.A.A.A.A.A.a.a.b@a.y R+t&R+R+c@u&A =#+ C + ;                                                                       ",
+"                                                                        . + + v&w&x&(%a&c&y&[%}%|%%&e&e&=&2%3%-&-&;&;&J$K$>&,&'&)&!&x%y%Q$$$z&{&&$*$*$]&E%F%F%G%H%I%b%c%J%^&K%A&B&C&D&:&E&F&G&u@&%T%g#H&*%i#B@C@j#=%U%G@l%-%I&9$K@a$b$2&c$e$f$n&g$!@i$J&j$K&u#k$w#x#y#W%o&B#,%C#C#,%'%D# # # # # # #E+<+E+E+<+}+[+F+F+F+F++#+#|+S.|+|+2+T.M+L&M&N&c F F X.O&Z.Z.Z. + +Z.O+P+P+P+P+p.r.o.8+r.Q+s.9+8+8+8+8+9+9+4.4.4.4.6.6.@+@+@+@+#+#+.. .....+.s +.$+$+x.x.x.y.y.#.z.z.z.u u z.A.A.B.A.A.a.R+a.a.y b.R+b@R+R+R+P&Q&B + + + +                                                                       ",
+"                                                                      # + + + R&S&T&_%c&c&d&[%u%%&&&e&*&w%2%3%-&f&;&U&K$K$>&,&'&)&x%y%~&z%z%A%g&&$*$C%]&E%F%F%H%V&a%b%c%J%^&K%A&W&X&Y&Z&E&`& *x@T%|&k%h#i#i#B@j#j#U%U%G@l%-%1&9$L@.*b$2&d$f$f$n&g$h$i$V%j$^@k$w#z#o&+*+*+*B#C#C#m%,%D# #.# #.# # #.#F+E+E+E+<+[+F+F+F+F+F++#+#|+|+|+|+2+2+@#2+@*#*$*F o$6@%*n.Z. +k. +`.O+P+0@P+P+o.8+o.o.r.r.8+8+8+8+8+8+9+4.3.4.4.3.` 6.#+@+@+#+a@#+$+....$+@.+.$+$+$+x.x.x.y.#.t z.z.u v u z.A.A.A.A.A.a.a.a.a.y y b@b@b@R+R+c@&*A H + % + +                                                                     ",
+"                                                                      + + + D **S&=*_%c&y&d&}%|%%&&&e&*&w%3%-&-&;&;&U&K$L$'&'&)&!&y%y%~&z%z&{&g&*$*$]&]&E%F%G%H%V&a%b%J%-*K%;*>*,*'*)*!*E&~*`&{*T%|&k%*%i#B@C@j#D@U%]*G@-%I&1&K@L@b$b$c$e$f$;%n&3&h$J&v#_@[@o&o&+*+*^*+*+*C#X%C#C#D#D# # # # # # #.#E+E+E+E+<+[+F+F+F+F+F++#+#@#|+|+@#M+2+@#@#n%/*(*F F F _*Z.Z. + +Z.Z.P+P+P+P+P+o.o.o.o.r.r.8+8+8+8+8+8+9+4.@+4.4.6...@+@+@+@+#+#+#+......$++.+.$+$+$+x.x.x.y.#.#.z.z.w u z.A.B.A.A.A.A.a.a.a.a.y y b@b@b@:*:*<*P&[*B + + + @                                                                     ",
+"                                                                      . . + + }*|*:%a&c&d&d&}%|%&&&&*&w%w%3%-&f&;&U&1*K$L$,&'&)&x%x%~&2*z%A%{&g&*$3*]&D%F%F%H%H%4*b%J%J%5*K%;*6*,*7*8*9*0*~*a*b*g#c*k%i#i#B@C@j#D@U%]*-%-%I&d*L@L@b$2&c$e$f$n&e*/@y#o&o&A#A#o&o&+*+*+*+*+*C#C#C#C#D#D# # # # # # #.#E+F+E+E+[+|+F++#F+F++#E#+#|+|+|+@#2+2+@#@#f*g*h*7&F F i*l.Z.n. +Z.O+0@P+P+P+P+o.o.o.o.r.r.8+8+8+8+8+8+9+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.@.$+$+x.%+x.%+y.#.z.A.z.u u z.A.A.A.A.A.A.a.a.a.a.y y b@b@t&b@R+:*c@C.B H + + + @                                                                   ",
+"                                                                      + + % + j*k*:%c&l*d&m*u%|%&&e&*&w%2%3%-&H$;&U&K$L$L$'&'&!&x%y%~&2*z&A%g&B%*$=$]&E%F%G%H%V&a%3#J%J%K%Y$n*o*,*p*q*r*s*t*u*v*k%c**%i#B@j#j#D@U%w*G@I@I&1&K@=@x*b$c$c$f$y*z*A*W%W%o&o&B#A#o&+*^*+*+*+*+*C#C#C#C#D#D# # # # # # #.#E+E+E+E+[+[+F+F+F+F++#+#+#|+|+|+@#2+2+@#@#B*C*D*'.F F X.E*O+ + +Z.O+P+P+P+P+P+o.o.o.o.r.r.8+8+9+8+8+9+0+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.+.$+$+x.x.a+x.y.#.z.z.z.u u z.A.A.A.A.A.A.a.a.b@a.y R+t&b@b@b@R+:*<*F*G*=#+ C + +                                                                   ",
+"                                                                      @ + + & H*I*:%c&y&d&}%u%1%&&*&*&w%3%-&f&;&U&U&K$L$,&'&)&!&x%~&2*z%%$A%g&*$=$=$D%E%G%H%H%4*a%c%J%5*K%;*>*o*J*K*L*M*N*O*P*Q*k%k%A@i#B@C@j#D@U%]*l%-%I&1&K@L@b$2&c$f$R*A*S*W%[@o&+*A#z+A#o&+*+*+*+*+*B#,%C#C#,%'%D# # # # # # #E+<+E+E+<+}+[+F+F+F+F++#+#|+S.|+|+2+T.M+@#@#`.T*U*$*F F o$V*n. + +Z.O+P+P+P+P+p.r.o.8+r.Q+s.9+8+8+8+8+9+9+4.4.4.4.6.6.@+@+@+@+#+#+.. .....+.s +.$+$+x.x.x.y.y.#.z.z.z.u u z.A.A.B.A.A.a.R+a.a.y b.R+b@b@b@b@b@:*R+P&S+B >.+ + +                                                                   ",
+"                                                                    . . # D W*X*Y*:%y&d&m*}%|%&&e&*&w%2%3%-&f&;&U&1*L$L$'&'&!&!&y%~&2*z&A%g&B%*$=$]&E%F%G%H%V&4*b%J%J%Z*K%n*6*o*J*`* =.=+=O*@=#=H&h#i#B@B@j#D@=%]*]*-%-%1&d*L@x*2&c$V%$=S*A*A*W%W%o&o&A#A#o&o&+*+*+*+*+*B#C#C#m%,%D# #.# #.# # #.#F+E+E+E+<+[+F+F+F+F+F++#+#|+|+|+|+2+2+@#@#@#8@%=&=*=F F X.==n.k. +`.O+P+0@P+P+o.8+o.o.r.r.8+8+8+8+8+8+9+4.3.4.4.3.` 6.#+@+@+#+a@#+$+....$+@.+.$+$+$+x.x.x.y.#.t z.z.u v u z.A.A.A.A.A.a.a.a.a.y y b@b@b@b@b@b@:*R+c@&+A =#+ % . .                                                                 ",
+"                                                                    + % + + -=;=>=<%y&d&m*u%1%&&*&*&w%2%-&-&;&U&U&,=L$M$'&)&!&x%~&~&2*z&A%g&B%3*=$D%E%F%H%H%4*4*b%J%5*Z*;*n*o*'=J*b#)=!=~={=@={=]=h#i#B@C@j#D@=%]*w*-%I&1&d*L@x*c$^=$=A*A*A*A*W%W%o&o&A#A#o&o&+*+*^*+*+*C#X%C#C#D#D# # # # # # #.#E+E+E+E+<+[+F+F+F+F+F++#+#@#|+|+@#M+2+@#@#@#8@B*/=(=X.F X.7@l. +Z.Z.P+P+P+P+P+o.o.o.o.r.r.8+8+8+8+8+8+9+4.@+4.4.6...@+@+@+@+#+#+#+......$++.+.$+$+$+x.x.x.y.#.#.z.z.w u z.A.B.A.A.A.A.a.a.a.a.y y b@b@b@b@b@b@:*R+<*P&_=B + + + #                                                                 ",
+"                                                                    . + % + :=<=<%:%d&m*m*|%1%e&*&w%2%3%-&f&;&U&1*,=L$N$'&!&!&y%~&2*[=A%{&g&B%3*=$E%E%G%H%4*4*}=J%-*Z*Z*n*n*o*J*'=j%|=1=2=@=3=4=5=*%B@B@j#j#=%=%]*6=I&1&1&a$M@7=z*$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*+*+*+*+*C#C#C#C#D#D# # # # # # #.#E+F+E+E+[+|+F++#F+F++#E#+#|+|+|+@#2+2+@#@#@#8@Z.8=9=0=a=p$.+l. +Z.O+0@P+P+P+P+o.o.o.o.r.r.8+8+8+8+8+8+9+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.@.$+$+x.%+x.%+y.#.z.A.z.u u z.A.A.A.A.A.A.a.a.a.a.y y b@b@t&b@b@t&b=:*<*<*c=A H + + + $                                                               ",
+"                                                                    . + D + d=e=<%y&d&m*f=|%1%*&*&g=2%3%-&;&I$U&,=L$N$N$)&!&x%~&~&2*[=A%{&B%C%=$-$E%F%G%H%4*4*b%!$5*Z*;*h=i=J*J*j=j=k=l=m=n=3=o=p=q=C@C@D@D@=%]*6=-%8$1&d*L@)@y#$=$=$=A*A*A*A*W%W%o&o&B#A#o&+*^*+*+*+*+*C#C#C#C#D#D# # # # # # #.#E+E+E+E+[+[+F+F+F+F++#+#+#|+|+|+@#2+2+@#@#@#8@8@r=Z.M+ +r=Z. + +Z.O+P+P+P+P+P+o.o.o.o.r.r.8+8+9+8+8+9+0+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.+.$+$+x.x.a+x.y.#.z.z.z.u u z.A.A.A.A.A.A.a.a.b@a.y R+t&b@b@b@b@t&t&:*:*<*s=+&B + > + .                                                               ",
+"                                                                  @ + + + $ t=u=<%d&m*m*|%|%A$*&w%w%3%-&;&;&U&1*,=L$M$'&!&!&x%~&2*2*A%v=g&B%3*w=;$E%G%H%V&4*}=b%J%5*Z*n*n*6*J*'=j=#%x=y=z=A=o=o=B=C=B@j#j#=%=%]*6=-%1&1&0$h$z#$=$=$=$=A*A*S*W%[@o&+*A#z+A#o&+*+*+*+*+*B#,%C#C#,%'%D# # # # # # #E+<+E+E+<+}+[+F+F+F+F++#+#|+S.|+|+2+T.M+@#@#8@]%8@8@8@M+Z.Z.Z. + +Z.O+P+P+P+P+p.r.o.8+r.Q+s.9+8+8+8+8+9+9+4.4.4.4.6.6.@+@+@+@+#+#+.. .....+.s +.$+$+x.x.x.y.y.#.z.z.z.u u z.A.A.B.A.A.a.R+a.a.y b.R+b@b@b@b@b@t&t&:*:*<*D=E=B >.+ + + +                                                             ",
+"                                                                  . + % + F=G=>=[%d&m*f=|%1%e&*&w%2%3%-&;&;&U&,=,=M$N$)&!&x%y%~&2*H=A%{&B%C%=$-$E%F%G%H%V&4*}=c%5*Z*A&n*i=o*J*j=j=j%I=J=K=L=M=N=O=P=C@j#D@=%U%w*6=I&1&d*h$z#z#A*$=$=A*S*A*A*W%W%o&o&A#A#o&o&+*+*+*+*+*B#C#C#m%,%D# #.# #.# # #.#F+E+E+E+<+[+F+F+F+F+F++#+#|+|+|+|+2+2+@#@#@#8@8@8@8@M+9@Z.Z. +k. +`.O+P+0@P+P+o.8+o.o.r.r.8+8+8+8+8+8+9+4.3.4.4.3.` 6.#+@+@+#+a@#+$+....$+@.+.$+$+$+x.x.x.y.#.t z.z.u v u z.A.A.A.A.A.a.a.a.a.y y b@b@b@b@b@b@t&:*<*Q=R=S=T=G*=#+ C $ ;                                                             ",
+"                                                                  . + + + U=V=<%[%d&m*f=|%A$*&w%w%3%3%f&;&U&1*,=>&M$N$)&!&x%~&2*2*H=A%g&B%C%=$-$E%F%H%V&4*}=}=J%5*Z*>*n*i=J*j=j=j%j%W=X=Y=Z=`=`= -.-j#j#=%=%]*w*6=1&d*V%+-z#z#$=$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*+*^*+*+*C#X%C#C#D#D# # # # # # #.#E+E+E+E+<+[+F+F+F+F+F++#+#@#|+|+@#M+2+@#@#@#8@8@8@8@M+M+Z.Z. + +Z.Z.P+P+P+P+P+o.o.o.o.r.r.8+8+8+8+8+8+9+4.@+4.4.6...@+@+@+@+#+#+#+......$++.+.$+$+$+x.x.x.y.#.#.z.z.w u z.A.B.A.A.A.A.a.a.a.a.y y b@b@b@b@b@b@t&:*:*:*<*@-D=#-B + + + +                                                             ",
+"                                                                  + + D + $-%-[%d&m*f=%&1%A$*&w%2%3%-&;&;&U&1*,=>&N$O$!&x%x%~&2*[=H={&g&B%]&-$;$F%F%H%V&}=}=&-J%Z*A&>*i=i=J*'=j=j%j%W=*-=---;->-C=C@j#D@=%U%]*6=,-d*J&+-$=W%z#$=$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*+*+*+*+*C#C#C#C#D#D# # # # # # #.#E+F+E+E+[+|+F++#F+F++#E#+#|+|+|+@#2+2+@#@#@#8@8@8@8@M+M+Z.Z.n. +Z.O+0@P+P+P+P+o.o.o.o.r.r.q.'-q.8+8+8+9+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.@.$+$+x.%+x.%+y.#.z.A.z.u u z.A.A.A.A.A.A.a.a.a.a.y y b@b@t&b@b@t&b=:*Q=:*:*R=S=)-A C + % + +                                                           ",
+"                                                                + + # + & !-~-[%d&m*f=%&1%v%w%w%{-3%-&;&U&K$,=>&M$O$O$!&x%y%2*2*H=H=g&g&C%]&-$;$F%G%H%4*}=}=J%^&Z*A&n*]-^-'=j=#%j%S%W=/-(-*%*%i#B@j#j#=%=%]*w*,-1&^@+-+-z#<@z#$=$=$=A*A*A*A*W%W%o&o&B#A#o&+*^*+*+*+*+*C#C#C#C#D#D# # # # # # #.#E+E+E+E+[+[+F+F+F+F++#+#+#|+|+|+@#2+2+@#@#@#8@8@]%8@M+Z.O+Z. + +Z.O+P+P+P+P+P+o.o.o.++_-:-<-[-}-8+8+9+0+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.+.$+$+x.x.a+x.y.#.z.z.z.u u z.A.A.A.A.A.A.=.|-1-a.y R+t&b@b@b@b@t&t&:*:*:*:*R=<*2-_=B + + + *                                                           ",
+"                                                                & + % + 3-4-5-[%m*f=%&1%1%v%w%3%3%-&;&U&U&1*,=>&N$N$!&x%x%~&2*[=H={&&$B%]&=$6-;$F%H%4*4*}=&-J%Z*A&>*i=i=J*'=j=#%j%W=W=/-k%h#*%i#7-8-D@=%U%]*6=9-0-+-+-+-z#z#$=$=$=$=A*A*S*W%[@o&+*A#z+A#o&+*+*+*+*+*B#,%C#C#,%'%D# # # # # # #E+<+E+E+<+}+[+F+F+F+F++#+#|+S.|+|+2+T.M+@#@#8@]%8@8@8@M+Z.Z.Z. + +Z.O+P+P+P+P+p.r.o.8+a-b-c-d-e-f-8+8+9+9+4.4.4.4.6.6.@+@+@+@+#+#+.. .....+.s +.$+$+x.x.x.y.y.#.z.z.g-h-i-j-k-l-m-n-o-p-q-r-s-t-u-R+b@b@b@b@b@t&t&:*:*:*:*R=R=@-v-B H + + + +                                                         ",
+"                                                                + + D + w-x-[%d&m*f=%&1%v%y-w%3%3%-&;&U&U&,=>&>&N$O$!&x%y%~&2*H=z-g&g&C%D%-$;$F%G%H%4*4*}=&-A-Z*A&>*i=^-J*j=#%j%S%W=B-/-k%*%*%B@C@j#D@=%]*]*9-C-+-+-+-+-z#z#A*$=$=A*S*A*A*W%W%o&o&A#A#o&o&+*+*+*+*+*B#C#C#m%,%D# #.# #.# # #.#F+E+E+E+<+D-E-F+F+F+F++#+#|+|+|+|+2+2+@#@#@#8@8@8@8@M+9@Z.Z. +k. +`.O+P+0@P+P+o.8+o.o.F-G-H-d-I-J-8+8+9+4.3.4.4.3.` 6.#+@+K-#+a@#+7.L-M-N-@.+.$+$+O-P-Q-R-S-T-U-z.V-W-X-Y-Z-`- ;`-.;+;@;#;$;%;&;*;=;b@b@b@b@b@t&:*<*:*:*<*S=R=S=-;;;=#+ H + $                                                         ",
+"                                                              $ & + + $ >;,;[%m*m*%&%&1%v%w%2%3%-&-&;&U&1*,=>&,&N$P$x%x%~&2*H=H=z-g&B%]&]&;$;$F%G%V&4*}=&-';5*Z*>*o*i=,*'=);#%S%W=W=!;~;h#*%i#B@8-D@=%U%]*9-{;];+-+-+-+-z#z#$=$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*+*^*+*+*C#X%C#C#D#D# # # # # # #.#E+E+2@^;/;(;_;:;<;[;F++#+#@#|+|+@#M+2+@#@#@#8@8@8@8@M+M+Z.Z. + +Z.Z.P+P+P+P+P+o.o.o.o.r.r.};|;1;2;8+8+9+4.@+5.3;4;5;6;7;8;9;0;a;b;c;d;e;f;g;+.$+h;i;j;k;l;k;m;n;o;p;q;r;s;t;u;s-v;w;x;y;z;A;B;C;D;E;b@b@b@b@b@t&:*:*:*:*<*R=R=R=F;G;B >.+ + +                                                         ",
+"                                                              # + + + & m@5-}%m*f=%&&&A$v%w%3%3%-&f&U&U&,=,=>&,&O$P$x%y%~&2*[=H=H;g&B%]&D%;$I;G%H%4*4*&-&-A-Z*>*>*6*^-,*j=j=j%S%W=B-/-k%h#*%B@B@8-D@=%U%9-{;];];$=+-+-$=W%z#$=$=$=A*A*A*A*W%W%o&o&A#A#J;K;L;M;N;O;P;Q;R;S;T;U;V;W;X;Y;Z;`; #.#E+F+ >.>+>@>#>$>%>_;&>E#+#|+|+|+@#2+2+@#@#@#8@8@8@8@M+M+Z.Z.n. +Z.*>=>->o.P+P+o.o.;>>>,>'>)>!>~>{>8+8+9+4.4.]>^>/>(>d;_>d;:><>[>}>f;|>1>2>3>4>$+5>j;6>7>%+8>k;9>0>z.a>Y-s;b>c>d>e>p; ;f>g>g>y;h>y;i>j>t&b@b@t&b=:*Q=:*:*R=k>R=R=S=l>A H + C + +                                                       ",
+"                                                              + + % + 3-m>[%}%f=%&%&&&A$w%2%3%n>-&;&U&1*L$>&,&N$P$P$x%~&~&[=H=z-H;B%C%]&E%;$I;G%H%4*}=&-';5*K%>*>*i=o>,*j=#%j%S%W=B-p>h#i#i#B@8-5$=%]*9-q>];r>+-y#+-+-z#<@z#$=$=$=A*A*A*A*W%W%o&o&B#A#s>t>u>v>w>x>y>z>A>w>B>C>D>E>F>G>H>I>J>|@E+K>L>M>N>[+F+O>P>%>Q>+#+#|+|+|+@#2+2+R>S>T>U>V>W>8@M+X>Y>Z>`> ,.,+,@,#,$,%,P+o.&,*,|;=,-,*,|;;,>,8+9+0+4.4.,,',),!,<>~,{,],^,2>9;/,..(,_,:,<,7.1>2>[,},x.@.|, ;W-1,2,3,4,5,A.A.A.6, ;x;7,8,9,0,a,b,c,b@b@b@t&t&:*:*:*:*R=R=Q=R=S=d,e,> + . + &                                                       ",
+"                                                              + + D + w-f,}%m*f=%&&&A$v%w%2%-&-&f&U&1*,=,=>&,&O$P$x%y%~&2*[=H=z-g&*$C%D%;$g,I;H%4*}=}=&-A-5*A&>*6*^-,*'=j=j%S%W=B-B-h,h#*%i#B@8-E@=%9-q>i,];];+-+-+-+-z#z#$=$=$=$=A*A*S*W%[@o&+*A#z+A#j,k,l,w>m,M;B#n,o,w>p,q,r, #s,t,u,B>v,w,<+x,y,z,A,[+F+B,C,D,E,+#|+S.|+|+2+T.F,G,H,I,J,K,L,M,M+.,N,O,O,P,Q,R,S,T,U,V,p.W,X,Y,Z,`, '.'+'Y,@'8+9+9+4.4.4.4.#';,d;$'@+@+%'2>0; ...&'*'='-';'f;2>>'x.y.y.,''')'!'~'r- ;{'A.B.A.]' ;^'/'a.y b.('_'b@b@b@b@t&t&:*:*:*:*R=R=:'k><'S=G;=#H + + @                                                       ",
+"                                                            ,.+ # + & -#['}%m*%&%&&&A$w%3%3%-&-&;&U&1*,=>&>&'&P$P$x%y%~&2*H=z-H;B%B%]&E%;$I;G%H%4*}=&-';5*Z*>*>*6*^-,*'=#%j%S%W=B-/-h,*%i#B@7-8-=%9-q>i,i,];];+-+-+-+-z#z#A*$=$=A*S*A*A*W%W%o&o&A#A#o&o&+*}'|'1'2'B#C#3'4'5'6' #.# #.#7'8'%>(;9'2@0'a'b'G+c'd'M>_;e'+#|+|+|+|+2+Q.f'g'h'i'j'k'l'm'l$n'o'I,p'q'r'X.s't'u'v's.)>w'*,x'r.8+y'z'd-A'8+9+4.3.4.4.3.B'C'D'E'@+#+F'2>[,G'..H'I'2>J'K'f;2>L'x.y.#.M'4,)'!'N'I' ;O'A.A.A.P'Q'D;]'=.y y R'S'T'b@b@b@t&:*<*:*:*<*S=R=Q=R=R=<'U'A H + + + V'                                                    ",
+"                                                            # + % + 3-W'x$}%f=%&&&&&v%w%2%3%-&f&;&U&,=,=>&,&'&P$.$~&~&2*[=z-z-g&B%C%D%E%I;I;H%H%4*}=&-A-5*Z*>*6*J*,*X'j=j%j%W=B-B-Y'Z'*%i#B@8-E@9-q>i,i,i,];];+-+-+-+-z#z#$=$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*`' )|'.)C#X%+)@)#)$) # # # # #%)%>&)*)E+E+_+=)-)v,D,;)>),)+#@#|+|+@#M+')))!)~)8@8@{)l'])^)Z./)()p'_):)<)F [)u'})Q+|)d-z'1)r.8+2)3)d-4)8+9+4.@+4.4.6.5)6);,7)@+#+8)2>9)0)..a)b)2>c)$+d)2>e)f)y.#.g) ;3,h)i)s- ;$;A.A.A.j)k)D;g>l)0,m)n)o)p)b@b@b@t&:*:*:*:*<*R=Q=Q=Q=R=S=q)G*H + . . $                                                     ",
+"                                                            + + D + w-r)}%m*%&%&&&e&v%w%3%3%-&;&;&1*,=>&>&'&)&P$.$y%~&2*H=H=H;B%B%]&D%E%I;,$H%V&}=}=';A-Z*>*6*6*o*,*X'#%j%S%W=B-/-p>*%*%B@C@8-1&q>i,i,+-y#o&+-$=+-+-$=W%z#$=$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*s)t)u)v)C#C#w)x>B>x) # # # # #y)z)%>A)E+E+[+B)C)D)E)F)G)H)I)|+|+|+@#2+2+J)K)L)M)N)O)l'P)Q)Z.R)S)l'T)J+U)F V)u'W)X)Z,d-Y)Z)r.8+`) !d-.!8+9+4.4.4.4.6.+!e-(>@!@+#+#!2>:>$!..%!&!2>*!$+=!t;e;-!;!>!,!'!)!!!~!{! ;3,]!^!A.A./!(!_!:!<!Y-[!j>t&b@b@t&b=:*Q=:*:*R=k>Q=Q=Q=R=R=}!|!> H + + +                                                     ",
+"                                                          % # + + $ -#1!}%f=%&&&&&*&w%2%3%-&2!;&U&1*,=M$,&'&P$3!.$~&2*2*H=z-g&B%C%]&E%F%I;'$H%V&}=&-A-5*Z*n*6*6*,*o>c#j%j%W=W=B-/-~;*%B@B@C@1&z*i,$=z#4!5!6!z#y#+-+-z#<@z#$=$=$=A*A*A*A*W%W%o&o&B#A#o&+*^*7!8!w>9!C#C#0!8!w>a! # # # # #b!.>%>c!E+E+[+d!F+F+e!f!g!&)h!|+|+|+@#2+2+i!j!k!l!m!n!D,o!p!O+Z.q!l'r!s!t!^ u!u'v!w!x!+'y!z!r.8+A!B!d-C!9+0+4.4.4.4.6.+!_>!,D!@+v.8)2>E!F!/,G!E!2>H!I!J!K!e;L!M!W-s;N!j-O!s-k;r-P!Q!R!A.A.a.S!T!U!V!W!X!b@b@b@b@t&t&:*:*:*:*R=R=Q=Q=Q=R=S=<'Y!> H + + %                                                     ",
+"                                                          * . + + & Z!`!}%f=%&&&e&v%`!3%3%f&f&;&1*,=>&>&'&'&P$.$y%~&2*[=H=H;B%B%=$]&E%I;1#'$V&}=&-';A-Z*Z*>*6*o*,*X'c#j%S%W=B-/-p>Z'*%B@C@I&w#z*+- ~.~s&X.6@+~z#+-+-z#z#$=$=$=$=A*A*S*W%[@o&+*A#z+A#o&+*+*@~#~w>$~,%C#%~&~*~=~ # # # # #-~;~z,>~2@,~'~)~F+F+F+!~$>%>~~S.|+|+2+T.M+{~g']~^~/~(~K,I,_~Z.Z.`>l':~<~[~}~|~u'1~2~3~4~!,5~6~3;7~8~d-9~0~a~4.4.4.4.b~c~d~!,e~f~%'[>g~9>e~h~&!i~j~k~9;7>l~m~n~o~p~q~r~z.s~t~u~v~w~x~A.A.a.R+a.a.y b.R+b@b@b@b@b@t&t&:*:*:*:*R=R=:'Q=Q=k>R=S=U'=#> . # +                                                     ",
+"                                                          & + % + 3-y~}%u%%&&&e&*&v%2%-&-&f&;&U&1*,=>&,&'&)&.$.$~&~&2*[=z-g&B%C%]&E%F%I;'$H%V&}=&-';5*Z*A&6*6*J*,*c##%j%W=W=B-/-p>Z'i#B@,-R*z*i,z~A~B~F F F C~<@+-+-z#z#A*$=$=A*S*A*A*W%W%o&o&A#A#o&o&+*+*D~#~w>E~C#C#F~G~w>H~.# #.# # #I~B>F)J~K~L~G>M~F+F+F+N~O~%>P~|+|+|+2+2+Q~()z,j!8@R~S~T~U~V~W~X~Y~l'Z~`~ {.{+{u'@{#{${%{&{c-*,I-+'*{={-{;{>{3.4.4.3.,{'{){!{~,~{{{]{=!^{/{M-({_{:{a)<{9.x.x.y.#.t z.z.u v u z.A.A.A.A.A.a.a.a.a.y y b@b@b@b@b@b@t&:*<*:*:*<*S=R=Q=Q=Q=:'R=S=T=' > >.+ .                                                     ",
+"                                                          + + D + w-[{u%f=%&&&e&v%w%3%3%-&f&;&U&,=>&>&'&'&!&.$+$2*2*[=H=H;g&B%]&]&E%F%,$'$V&4*}=';A-Z*Z*A&6*o*J*X'c#j%W=W=/-B-p>}{1$B@,-q>|{z*i,1{2{3{;.F F 4{5{z#+-z#z#$=$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*+*6{8'w>7{X%C#8{9{w>0{ # # # #a{b{%>c{d{e{f{g{h{F+F+i{j{%>k{l{|+|+@#M+2+m{n{z,o{n{p{o!])l'I,q{r{s{l't{u{v{w{x{y{z{A{#{B{C{D{E{>>F{@'G{H{I{J{@+4.4.6.K{u.@+@+@+#+#+#+......$++.+.$+$+$+x.x.x.y.#.#.z.z.w u z.A.B.A.A.A.A.a.a.a.a.y y b@b@b@b@b@b@t&:*:*:*:*<*R=Q=Q=Q=Q=:'R=R=}!' > H + + +                                                   ",
+"                                                        + + # + & -#L{}%%&&&&&*&v%2%3%-&-&;&U&U&,=>&,&'&)&!&.$Q$~&2*[=z-g&B%C%]&D%E%F%,$'$V&4*&-';Z*Z*A&6*o*J*J*c#c#j%W=W=B-/-p>M{i#N{q>O{|{z*i,z*P{Q{U)o$F X.R{<@$=W%z#$=$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*+*S{T{w>U{C#C#8{V{w>W{X{B+Y{Z{I>%>y,`{E+K>#>M>$>G,j{ ].]+]E,|+|+|+@#2+2+@#@]f'])o!#]$]%]&]*]V~|)=]-];]>]=>,]'])]!]~]{]I#]]s.8+8+8+8+8+8+9+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.+.$+$+$+x.x.%+y.#.z.A.z.u u z.A.A.A.A.A.A.a.a.a.a.y y b@b@t&b@b@t&b=:*Q=:*:*R=k>Q=Q=Q=Q=:'R=R=}!^]> H + . +                                                   ",
+"                                                        + + % + / /]`!u%|%&&e&*&w%2%3%-&f&(]U&1*>&>&N$'&!&.$#$Q$2*2*H=H;g&B%C%]&D%F%G%'$I%V&}=&-A-Z*Z*A&i=o*J*X'_]#%S%W=B-B-p>p>:]<]i,O{O{|{+-i,];[]}]|];.F F 1]+~[@<@z#$=$=$=A*A*A*A*W%W%o&o&B#A#o&+*^*2]3]4]w>5]6]7]8]9]w>0]a]b]c]d]e]X;f]E+E+E+g]h](;y,G)(;i]!~1+|+|+|+@#2+2+@#@#@#j]k]`.8@M+Z.O+Z. + +Z.O+P+P+l]m]n]'.o$F X.o]Q+8+8+9+8+8+9+0+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.@.$+$+x.%+a+x.y.#.z.z.z.u u z.A.A.A.A.A.A.a.a.b@a.y R+t&b@b@b@b@t&t&:*:*:*:*R=R=Q=Q=Q=Q=:'R=R=p]q]> H + + $                                                   ",
+"                                                        + + + + w-r]u%%&%&&&*&v%2%D$-&-&;&;&U&,=>&,&'&)&!&.$Q$~&2*[=H=H;B%C%]&-$D%F%,$)$I%4*&-';5*Z*A&A&6*J*J*c#c##%S%W=B-/-p>:]s]|{O{O{|{x#+-i,i,z*t]u]v]o$F 6@w]z+z#$=$=$=$=A*A*S*W%[@o&+*A#z+A#o&+*+*x]8'u>y]@)#~z]G~A]G~I>B]C]D]E]e{F]<+E+E+<+}+[+G]H]I]J]+#+#|+S.|+|+2+T.M+@#@#8@]%8@8@8@M+Z.Z.Z. + +Z.O+P+P+K]L]M]N]F F F s&X)9+8+8+8+8+9+9+4.4.4.4.6.6.@+@+@+@+#+#+.. .....+.s +.$+$+x.x.x.y.y.#.z.z.z.u u z.A.A.B.A.A.a.R+a.a.y b.R+b@b@t O]P]Q]R]S]T]U]V]W]X]Y]Z]`] ^Y].^+^@^#^> H + + @                                                   ",
+"                                                        . + + + -#$^u%%&&&e&*&w%2%3%-&f&;&U&1*,=>&,&'&!&!&+$Q$2*2*H=z-g&B%]&]&D%F%G%'$I%V&}=&-A-5*Z*A&>*o*J*'=c##%j%W=B-B-p>%^&^*^O{O{O{|{z*i,i,i,i,=^2{-^^ F F 6@;^<@A*$=$=A*S*A*A*W%W%o&o&A#A#o&o&+*+*@~>^,^'^)^!^~^{^]^^^/^B+.# # #.#F+E+E+E+<+[+F+F+F+F+F++#+#|+|+|+|+2+2+@#@#@#8@8@8@8@M+9@Z.Z. +k. +`.O+P+0@P+(^_^:^! o$F X.<^3.8+8+8+8+9+4.3.4.4.3.` 6.#+@+@+#+a@#+$+....$+@.+.$+$+$+x.x.x.y.#.t z.z.u v u z.A.A.A.A.A.a.a.a.u [^}^|^1^.^V]2^3^3^4^Y]5^6^7^8^9^0^0^a^a^b^c^d^e^f^> > + + +                                                   ",
+"                                                      - + + D + g^U$|%%&&&e&v%2%2%-&-&;&;&U&,=>&,&'&)&!&x%+$Q$2*[=H=H;B%B%]&D%D%F%G%'$I%4*}=';5*Z*A&A&6*J*J*j=c##%S%B-B-p>h^i^j^k^O{O{O{|{z*i,i,i,i,z*l^m^n^'.F F o^p^$=$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*+*^*+*+*C#X%C#C#D#D# # # # # # #.#E+E+E+E+<+[+F+F+F+F+F++#+#@#|+|+@#M+2+@#@#@#8@8@8@8@M+M+Z.Z. + +Z.Z.P+P+P+P+n.q^r^s^F F F X.t^s.8+8+8+9+4.@+4.4.6...@+@+@+@+#+#+#+......$++.+.$+$+$+x.x.x.y.#.#.z.z.w u u^v^w^x^y^A.z^A^B^C^D^E^F^G^H^V]I^J^3^K^Y]Y]6^L^8^8^ ^0^M^N^N^O^c^e^e^P^> > + + .                                                   ",
+"                                                      8 + + + / Q^R^|%&&*&*&w%2%3%-&f&;&U&1*,=>&,&'&)&!&x%Q$z%2*H=H=g&B%C%]&D%E%F%H%I%I%}=}=A-5*A&A&>*o*J*'=j=#%#%W=B-B-S^T^U^V^O{O{O{O{|{z*i,i,i,i,i,W^X^Y^Z^o$F 6@`^W%$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*+*+*+*+*C#C#C#C#D#D# # # # # # #.#E+F+E+E+[+|+F++#F+F++#E#+#|+|+|+@#2+2+@#@#@#8@8@8@8@M+M+Z.Z.n. +Z.O+0@P+P+P+P+ /./+/;.F F F @/Z 8+8+8+9+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.+.$+$+$+x.x.%+y.#.z.A.#/$/%/&/*/=/-/;/>/,/'/)/!/~/{/]/^/V]V]2^3^3^K^Y]5^6^L^8^9^0^0^a^N^b^O^//(/_/:/> > + + +                                                   ",
+"                                                      # + + + / </[/%&}/e&v%w%2%3%-&;&;&|/1*,=>&'&P$!&x%+$$$z%[=H=z-B%B%]&]&D%E%G%H%I%a%}=&-A-Z*A&A&6*^-J*'=c#b#j%W=p>1/U^U^U^V^O{O{O{O{|{z*i,];i,i,];A*2/3/4/'.F F o^5/W%$=A*A*A*A*W%W%o&o&B#A#o&+*^*+*+*+*+*C#C#C#C#D#D# # # # # # #.#E+E+E+E+[+[+F+F+F+F++#+#+#|+|+|+@#2+2+@#@#@#8@8@]%8@M+Z.O+Z. + +Z.O+P+P+P+P+P+o.6/7/8/F o$F F 9/4.8+9+0+4.4.4.4.6.6.@+@+@+@+#+#+#+......$++.@.$+$+x.%+a+x.y.#.0/V-a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/V]I^J^3^K^r/Y]5^L^`]8^s/0^M^a^N^O^c^t/e^u/v/> H + . @                                                   ",
+"                                                      + + + & / w/|%&&}/*&w%2%3%E$f&;&U&U&,=>&'&'&)&!&x%Q$z%2*H=H=g&B%C%]&D%;$F%H%'$2#b%}=A-Z*Z*A&>*6*J*'=j=#%#%B-x/y/U^U^U^U^*^|{i,O{|{x#+-i,i,i,i,];];z/A/B/C/o$F F D/W%$=A*A*S*W%[@o&+*A#z+A#o&+*+*+*+*+*B#,%C#C#,%'%D# # # # # # #E+<+E+E+<+}+[+F+F+F+F++#+#|+S.|+|+2+T.M+@#@#8@]%8@8@8@M+Z.Z.Z. + +Z.O+P+P+P+P+p.r.E/F/G/;.F F F I#H/8+9+9+I/J/K/L/M/N/@+@+@+@+#+#+.. .....+.s +.$+$+x.x.x.y.+.O/P/Q/R/S/T/U/V/W/X/Y/i/Z/`/ (.(+(p/@(#($(2^J^K^r/%(5^6^L^`]9^&(0^a^N^b^O^//d^*(=(^]> H + + c+                                                  ",
+"                                                      $ + + & a -(1%&&e&v%w%2%3%-&;&;&U&1*,=>&'&'&!&x%x%Q$z%[=H=z-g&B%]&D%D%E%G%V&I%a%}=&-A-Z*Z*A&6*6*J*'=c#S%;(>(U^U^U^U^U^U^*^O{O{O{|{z*i,i,i,i,i,];];+-,('()(;.F F 4{!(A*S*A*A*W%W%o&o&A#A#o&o&+*+*+*+*+*B#C#C#m%,%D# #.# #.# # #.#F+E+E+E+<+[+F+F+F+F+F++#+#|+|+|+|+2+2+@#@#@#8@8@8@8@M+9@Z.Z. +k.~({(](^(/(((_(:(>><([(}(|('.o$F X.o]3.9+4.1(2(3(4(5(6(7(@+@+#+a@#+$+....$+@.+.$+$+$+x...8(9(0(a(b(c(e/d(e(f(g(h(i(j(k(l(m(n(o(p(p/q(r(s(J^3^r/r/Y]5^L^L^9^s/&(M^a^N^b^c^t/e^t(u(v(> H + + +                                                   ",
+"                                                      + + % & d+w(1%&&*&v%2%3%3%f&;&U&U&,=>&,&'&)&!&x%y%Q$z%H=H=g&B%]&]&D%D%F%H%H%I%a%}=&-5*Z*A&>*6*o*'=:]x(y(z(U^V^U^V^U^U^j^k^O{O{O{|{z*i,i,i,i,i,];];+-[@A(B(C(o$F F R{B#A*A*A*W%W%o&o&A#A#o&o&+*+*^*+*+*C#X%C#C#D#D# # # # # # #.#E+E+E+E+<+[+F+F+F+F+F++#+#@#|+|+@#L&D(Q~E(F(G(H(I(J(K(*]L(M(l'N(O(P(Q(R(S(T(2(U(V(W(X(Y(Z(s^F F F s&X)@+`( _._._._._+_L/@+@+#+#+#+......$++.+.$+..@_#_$_%_&_*_=_-_e/;_>_,_'_'_)_!_!_~_{_]_^_/_p(@(q((___:_K^r/%(Y]6^L^`]s/s/0^M^N^b^O^//t/*(t(<_' > >.+ & -                                                   ",
+"                                                    % . + + / d+[_1%e&}_w%2%3%-&f&;&U&1*,=>&'&'&!&!&x%~&z%z&H=z-g&B%]&]&D%E%F%H%V&a%b%&-A-Z*Z*>*>*|_1_2_T^T^z(z(U^U^U^U^U^U^V^O{O{O{O{|{z*i,i,i,i,i,];];$=+-3_t!4_<)F F 4{5_o&A*A*W%W%o&o&A#A#o&o&+*+*+*+*+*C#C#C#C#D#D# # # # # # #.#E+F+E+E+[+|+F++#F+F++#E#+#|+6_+>7_8_9_0_a_b_c_d_e_f_g_h_._._._._._._._._._._._._i_j_o.k_l_m_;.F F F n_4.o_p_._._._._._ _q_@+#+#+#+......$++.r_s_t_u_u_v_w_x_=_b(c(y_z_A_B_'_C_D_!_E_~_!/!/F_G_H_q(I_J_K_L_r/r/%(5^Z]L^M_s/s/M^a^N^b^c^//t/N_O_P_=#> + & +                                                     ",
+"                                                    $ + + + / -#Q_&&*&}_2%2%3%-&;&U&U&R_,=,&'&)&.$x%y%Q$S_z&H=g&g&C%]&D%D%F%F%H%V&a%b%&-A-Z*T_U_V_y/z(T^T^z(W_z(U^U^U^U^U^U^V^O{O{O{O{|{z*i,];i,i,];r>+-y#+-z#X_Y_Z_'.F X.i*`_A*A*W%W%o&o&B#A#o&+*^*+*+*+*+*C#C#C#C#D#D# # # # # # #.#E+E+E+E+[+[+F+F+F+F++#+#+#|+ :.:._._._._._._._._._._._._._._i_S(+:b_@:#:._._._._._$:%:r.&:*:C(F F F F =:8;4(._._._._._2(-:@+#+#+#+......;:>:,:':$_$_u_):!:R/=_-_~:{:]:^:C_C_)_D_!_E_~_!//:(:_:::<:(_[:}:|:r/%(%(6^L^`] ^s/0^M^N^N^c^//t/1:t(O_2:=#> . + $                                                     ",
+"                                                    % + + + / g^3:e&4:g=2%3%-&G$;&U&,=,=>&'&)&!&!&x%y%z%z&H=z-g&B%C%]&D%E%I;G%V&I%3#6*5:6:7:8:8:8:y/T^T^T^z(z(T^U^U^U^U^U^U^*^|{i,O{|{x#+-i,i,i,i,];];+-+-+-+-=^9:0:a:o$o$6@b:,%W%[@o&+*A#z+A#o&+*+*+*+*+*B#,%C#C#,%'%D# # # # # # #E+<+E+E+<+}+[+F+F+F+F++#+#|+S.c:d:._._._._e:f:8_L,()g:._._._._+:h:i:j:k:l:m:n:._._._2(o:Q+p:q:r:G*F F F s:t:._._u:._._._._v:w:#+#+.. .;:#_x:y:z:':u_u_A:B:C:R/b(c(D:E:F:B_C_C_D_D_E_~_!/G:(:H:I:J:K:L:[:M:N:O:%(P:L^L^M_ ^&(M^M^N^b^c^c^t/1:O_d^Q:> H + + +                                                     ",
+"                                                    $ & + + / g+Z**&}_2%3%3%-&;&U&U&,=,=,&'&)&!&x%y%~&z%z&H=z-g&B%]&D%E%F%F%}=R:S:T:U:U:8:8:8:8:8:y/T^T^T^z(z(T^U^U^U^U^U^U^*^O{O{O{|{z*i,i,i,i,i,];];+-+-+-+-z#V:W:X:;.o$F 4{Y:W%W%o&o&A#A#o&o&+*+*+*+*+*B#C#C#m%,%D# #.# #.# # #.#F+E+E+E+<+[+F+F+F+F+F++#+#|+Z:`:._._._h_g:k' <.<8@N+N,._._._._+<@<`.O+P+0@#<-,$<._._%<&<F-8+*<=<-<F o$F ;<><._,<'<i_._._._u:)<a@#+$+!<~<{<x:z:':$_u_v_]<^<R/=_-_c(/<F:(<B_C_)_D_!_E_~_!//:H:H:_<H^:<<<[<}<|<1<%(6^7^`] ^s/&(M^N^N^c^c^t/1:t(2<3<q]H H + $ *                                                     ",
+"                                                    @ + + + / T+4<*&g=5<3%3%f&;&U&1*,=>&,&'&!&!&x%y%~&z%A%H;g&B%C%D%E%6<5:6:7:U:i^i^U:U:8:8:8:8:8:y/T^T^U^z(z(U^V^U^V^U^U^j^k^O{O{O{|{z*i,i,i,i,i,];];+-+-+-+-z#[@7<Q{5+o$F F w]A+W%o&o&A#A#o&o&+*+*^*+*+*C#X%C#C#D#D# # # # # # #.#E+E+E+E+<+[+F+F+F+F+F++#+#@#8<9<._._d:0<a<H+8@8@8@8@b<h_._._._c<d<Z.P+P+P+P+e<C!R(._._f<g<8+5.h<i<N]F F j<k<._u:l<V(._._._d:m<n<#+o<p<q<q<,:z:':$_v_r<s<t<R/b(-_u<v<F:B_C_C_C_!_!_~_!/!/(:H:w<H^V]I^x<y<}<z<A<P:6^L^M_ ^&(0^a^N^b^////t/1:2<O_B<C<> + + + #                                                     ",
+"                                                    . + + + / D<E<w%5<5<3%-&f&;&U&,=,=,&,&)&!&x%x%~&~&z&A%{&H%F<G<H<I<J<7:7:U:U:i^i^U:U:8:8:K<8:L<M<N<O<P<Q<R<U^U^U^U^U^U^V^O{O{O{O{|{z*i,i,i,i,i,];];$=+-+-$=W%[@S<T<U<V<F F 6@W<A#o&o&A#A#o&o&+*+*+*+*+*C#C#C#C#D#D# # # # # # #.#E+F+E+E+[+|+F++#F+F++#E#+#|+X<e_._%<9_Y<@#@#8@8@8@8@Z<g_._._._`< [O+0@P+P+P+P+o..[+[._@[#[8+8+$[%[&['.F *[%<._=[-[Y,%<._._._p_;[>[p<{<q<t_,:,[$_u_v_'[)[t<=_-_c(![~[^:B_C_)_D_!_E_~_!//:(:H:H^H^I^I^J^{[][^[/[P:L^`]M_ ^0^M^N^N^c^//t/1:t(([_[:[' > + + + +                                                     ",
+"                                                    & + + + / g+<[[[}[|[3%f&f&U&1*,=1[,&'&)&!&A%D%2[j=3[4[5[6[6[J<J<7[8[9[0[a[b[c[d[e[f[g[h[i[j[k[l[m[n[o[p[q[U^U^U^U^U^U^V^O{O{O{O{|{z*i,];i,i,];r>+-y#+-+-z#<@z#W%r[s[t['.F X.u[v[o&o&B#A#o&+*^*+*+*+*+*C#C#C#C#D#D# # # # # # #.#E+E+E+E+[+[+F+F+F+F++#+#+#|+w[5(._g:x[@#@#@#8@8@]%8@y[z[._._._f:A[O+P+P+P+P+P+o.B[C[+_._D['-8+E[F[G[*=m_H[._._I[ .J[K[._._._L[M[N[p<{<t_t_z:,[$_v_v_O[P[R/b(-_e/Q[F:^:R[)_)_!_!_~_~_/:(:H:H:H^V]V]I^3^K^S[%(P:Z]L^M_ ^0^0^a^N^b^c^//t/1:2<2<_[T[=#H + + +                                                       ",
+"                                                    % . + + / -#R@U[V[V[W[X[Y[Z[`[ }.}+}@}#}5[$}$}$}%}%}&}*}=}-};}>},}'})}!}~}{}]}^}/}(}%<._._._._._._._.__}:}U^U^U^U^U^U^*^|{i,O{|{x#+-i,i,i,i,];];+-+-+-+-z#z#$=$=r,<}[}<)F F o$}}C#A#z+A#o&+*+*+*+*+*B#,%C#C#,%'%D# # # # # # #E+<+E+E+<+}+[+F+F+F+F++#+#|+|}1}._e:2}M+@#@#8@]%8@8@8@3}4}._._._p_5}O+P+P+P+P+p.r.o.6}7}D[Z,8}8+8+9}0}a}b}c}._d}e} .$!D[._._f}g}h}i}~<q<t_,:j},[u_v_v_k}t<=_b(c(l}m}^:B_R[)_D_!_!_~_!//:n}H:H^H^o}I^J^3^r/%(P:P:L^`]M_ ^0^M^a^N^c^//t/t/t(2<_[p}q}=#>.. + &                                                       ",
+"                                                      . & + & w-r}U[V[s}t}u}U[v}w}w}w}x}y}y}$}$}$}$}%}%}z}h_._._._._._._._._._._._._._._._._._._._._._._._._A}B}U^U^U^U^U^*^O{O{O{|{z*i,i,i,i,i,];];+-+-+-+-z#z#A*$=W%C}/=D}'.F X.i*'%A#A#o&o&+*+*+*+*+*B#C#C#m%,%D# #.# #.# # #.#F+E+E+E+<+[+F+F+F+F+F++#+#|+E}F}._G}H}@#@#@#8@8@8@8@M+I}J}._._._+[K}O+P+0@P+P+o.8+o.o.L}a-8+8+8+8+q.M}N}O}P}._Q}R}S} .T}U(U}V}W}X}Y}{<t_t_,:,[$_v_v_%_Z}R/b(-_e/y_`}^: |.|D_!_!_~_~_/:/:H:w<H^V]I^2^J^K^%(%(Z]Z]L^8^ ^0^M^+|N^b^c^//t/1:2<2<@|#|$|H + H . .                                                       ",
+"                                                      + + % & a %|U[V[&|t}u}U[w}w}w}w}x}y}y}$}$}$}$}%}%}*|=|-|;|._._._._._._i_>|,|'|)|!|~|{|]|>|^|%<._._._._/}/|U^V^U^U^j^k^O{O{O{|{z*i,i,i,i,i,];];+-+-+-+-z#z#$=$=$=j,(|N}C/o$F I#_|A+A#o&o&+*+*^*+*+*C#X%C#C#D#D# # # # # # #.#E+E+E+E+<+[+F+:|<|[|}|||1|2|3|4|5|6|7|@#@#@#8@8@8@8@M+8|9|._._._d_0|P+P+P+P+P+o.o.o.o.r.r.8+8+8+8+8+a|b|c|._._d|e|f|x.g|h|V}i|W}j|k|l|t_t_,[,[u_v_m|n|o|=_b(c(e/p|q|^:R[)_D_D_E_~_!/(:(:H:w<H^V]2^J^3^r/%(P:Z]L^`]M_ ^0^a^a^N^b^//t/t/t(2<r|@|s|' H + + .                                                         ",
+"                                                      . + + + / t|u|t}&|V[u}U[w}w}w}w}x}y}y}$}$}$}$}%}%}v|w|x|y|z|._._._._e:A|B|C|U:U:8:8:K<D|E|F|G|H|._._._._I|J|U^U^U^V^O{O{O{O{|{z*i,i,i,i,i,];];$=+-+-$=W%z#$=$=$=W%K|Y^L|;.F F o^5/A+o&o&+*+*+*+*+*C#C#C#C#D#M|N|e{O|P|Q|R|S|T|U|.>V|[+|+F+W|X|Y|Z|e_U(n:`|._._g: 1@#@#@#8@8@8@8@M+.1+1._._._e_@10@P+P+P+P+o.o.o.o.r.r.8+8+8+8+8+q.#1$1._%1&1*1=1..-1;1>1W},1'1)1!1t_~1,[{1v_v_]1^1/1=_-_e/S/(1_1R[R[D_!_!_~_~_/:(:H:w<H^V]:1<1[1}1|1112131415161718191a^b^c^//t/1:t(2<01a1b1=#H + + +                                                         ",
+"                                                      * $ + + / c1d1u}V[t}u}U[w}w}s}w}x}y}$}%}$}$}%}>(%}6[6[6[e1>|._._._._f1g1i^i^U:U:8:8:8:8:y/z(h1i1j1k1._._l1m1U^U^U^V^O{O{O{O{|{z*i,];i,i,];r>+-y#+-+-z#<@z#$=$=$=A*`@n1s[o16@F X.p1q1r1s1t1u1v1w1x1y1z1F>A1D#B1C1D19|]}E1F1_}%<._e:G1[+[+F+H1i_._._._._._._._f_I1J1@#@#@#8@8@]%8@M+K1L1._._._3(M1P+P+P+P+P+o.o.o.o.r.r.8+8+9+8+8+9+N1O1P1Q1R1S16.T1U1V1W1W}j|'1X1Y1Z1':,[{1v_m|m|`1 2b(c(e/.2+2@2R[.|D_!_E_~_!//:(:H:w<H^#2$2%2&2*2=2-2;2>2,2'2)2!2~2{2N^b^//t/1:t(2<r|@|p}]2=#+ . + .                                                         ",
+"                                                      % % + + $ ^2<[U[/2u}(2U[w}v}w}x}y}_2$}$}$}$}%}%}6[6[6[6[:2,}._._._._<2[2y(i^U:8:K<8:8:8:y/T^T^T^}2|2^|._._1222U^U^*^|{i,O{|{x#+-i,i,324252627282+-+-z#z#$=$=$=$=A*S*9202m_;.~]a2b2c2d2._._h_k1e2s1f2#:g2h2'%i2._._._._._._._._e_j2k2}+[+F+l2m2n29|._._._h_0_o2p2M+@#@#8@]%8@8@8@M+#<`<._._._@[q2P+P+P+P+p.r.o.8+r.Q+s.9+8+8+8+8+r2s2._._t2u26.v2U1U1w2x2y2'1d/z2A2B2,[{1C2v_]1]1D2E2-_c(S/.2F2G2R[.^D_!_E_~_/:(:H:H2H^H^I2J2K2}<L2M2N2O2P2Q2R2S2T2U2V2N^O^//t/1:1:2<r|a1W2' H + % + %                                                         ",
+"                                                      = + + D + -#X2U[Y2U[U[v}w}w}w}x}y}y}$}$}$}$}%}%}6[6[6[6[J<Z2._._._._'}`2i^U:U:8:8:8: 3.3+3@3T^T^z(#3$3%3._{}&3U^U^*^O{O{O{|{z**3=3-3;3>3,3m['3)3!3~3{3z#A*$=$=A*S*A*=^]3^3/3(3_3._.__}:3<3E1i_._5([3._}3|3D#13f{23n:._._._._33E>43<+[+F+F+F+F+53E)5(._._63732+2+@#@#@#8@8@8@8@M+9@83P(._._._`|93P+0@P+P+o.8+o.o.r.r.8+8+8+8+8+8+03R(._.__>3.a3b3c3d3e3f3g3'1X1z2h3i3j31^v_m|]1k3l3m3c(e/.2T/n3o3p3.^!_E_~_!//:(:H:w<H^V]q3r3s3t3z<N2u3v3P2w3x3y3z3A3B3b^////1:t(2<C3C3D3E3=#H + + +                                                           ",
+"                                                        + + + + w-F3u|Y2U[U[w}w}w}w}x}y}y}$}$}$}$}%}%}J<6[6[J<G3H3e:._._._)}I3i^U:U:8:8:8:J3K3k[O<T^U^z(z(L3M3N3f1O3U^j^k^O{O{O{P3Q3R3:3%<._._._._._._S3T3U3V3$=$=$=A*A*A*S*W3X3Y3h_._Z3H[`39! 4.4+4@4n:._._._f{D# # ##4$4%<._._._3(%4E+<+[+F+F+F+F+F+&45(._i_H,*4M+2+@#@#@#8@8@8@8@M+M+=4O(._._._._-4P+P+P+P+o.o.o.o.r.r.8+8+8+8+8+8+;4z[._3(N/>4,4'4)4!4~4{4]4^4X1/4(4_4:41^v_m|k3<4[4}4c(S/.2|41424.^D_!_!_~_!/(:H:H:H^H^I^2^J^K^344454O2v3Q2R26474a^N^N^c^//t/t(t(2<C3849404=#>.. + #                                                           ",
+"                                                        $ + % + 3-a4b4Y2U[U[w}w}w}w}x}y}y}$}$}$}$}%}%}6[6[6[J<J<c4/}._._._d4e4i^U:U:8:8:K<f4._T3g4T^T^z(z(U^h4i4j4U^U^V^O{O{O{k4;3k1._._k1~}l4m4n4_}._._._}3o4p4$=$=A*A*A*A*q4r4s4._._t4u4B#+*+*+*+*v4w4:3._._23x4 # # #y4z4._._._._A4K>[+|+F++#F+F++#l!._._9<B4@#2+2+@#@#@#8@8@8@8@M+M+6+C4._._._._D4P+P+P+P+o.o.o.o.r.r.8+8+8+8+8+8+d~._._E4F4G4H4I4J4K4L4M4N4z2z2h3(4O4P4Q4m|]1k3<4R4S4y_S/T/T414U4V4!_!_~_!//:(:H:w<H^V]2^2^X]K^%(W4X4v3P2w3R2Y4Z4a^N^b^////1:t(2<2<C3D3`4 5H + H + 8                                                           ",
+"                                                        ,.+ # + & -#.5u|U[U[U[w}s}w}x}y}$}%}$}$}%}>(%}6[6[6[J<J<+5^}._._._@5#5i^U:U:8:8:$5k[._~}%5T^z(W_z(U^U^U^U^U^U^V^O{O{&5*5`|._S3=5-5;5>5,5'5)5!5._._._d2~5$=$=A*A*A*A*{5]5._._^5/5o&+*^*+*+*+*+*(5Y;<3.__5:5 # # #B+<5`|._._._[5}5[+[+F+F+F+F+|515._._2535@#2+2+@#@#@#8@8@]%8@M+Z.O+45._._._._55P+P+P+P+o.o.o.o.r.r.8+8+9+8+8+6575._859505a5b5c5d5i|,1j|d/X1/4h3e5f5g5h5m|k3k3<4i5j5k5.2|4T4f/l5m5E_E_~_!/(:H:n5H^H^V]2^J^J^K^%(P:o5p5Q2w3)2q5r5N^N^s5//t/t(t(2<r|D3D3t5=#H + + +                                                             ",
+"                                                          + + D + w-u5d1v5U[U[v}w}x}y}_2$}$}$}$}%}%}6[6[6[6[J<J<w5H|._._._x5y5i^U:8:K<8:z5A5._{}B5T^z(z(T^U^U^U^U^U^U^*^|{C5;3d:._._D5E5i,i,];];+-F5G5/}._._._H5I5$=A*A*S*W%J5:3._._F1K5o&+*+*+*+*+*B#,%L58!e:e:M5 # # # #N5e2._._._%<O5P5[+F+F+F+F+Q59<._U(R5|+2+T.M+@#@#8@]%8@8@8@M+Z.Z.U~._._._._S5P+P+P+p.r.o.8+r.Q+s.9+8+8+8+8+T5U585V5W5X5Y5Z5`5 6.6+6@6#6$6%6(4&6f5*6=6-6k3<4R4R4;6>6T/T414g/,6'6E_~_~_!/(:H:w<I:V]I^2^)6X]%(%(Z]!6~6w3R2!2{6a^N^b^d^//1:t(2<2<C3D3B3]6=#H . + +                                                             ",
+"                                                          # + % + a c1^6d1/6U[U[w}x}y}y}$}$}$}$}%}%}6[6[6[6[J<J<(6{}._._.__6:6U:U:8:8:L<<6[6._]}}6T^z(z(T^U^U^U^U^U^U^*^O{|616._._._26i,i,i,];];+-+-36>|._._._T346A*S*A*A*W%56S3._._._667686+*+*+*+*B#C#C#9606E1a6|@ #.# #B+b65(._._._c6d6F+F+F+F+F+1|3(._e6f6|+2+2+@#@#@#8@8@8@8@M+9@Z.Z.q{._._._._8_.+P+P+o.8+o.o.r.r.8+8+8+8+8+8+^,d:g6h6i6j6k6l6m6n6o6~<p6q<q6r6e5f5s6t6u6v6k3[4R4w6x6`}y6T4f/g/h/z6A6~_!/(:(:n5H^H^I^2^J^X]r/%(P:Z]B6C6w3)2!2D6a^b^s5d^t/1:t(2<r|D3E6`4C<=#+ + + .                                                             ",
+"                                                          . + + + & -#X2F6u|Y2U[w}x}y}y}$}$}$}$}%}%}J<6[6[J<G3J<G6H6._._._l1I6J6K6L6M6N6~}._._%3O6U^z(z(U^V^U^V^U^U^j^k^O{P6;|._._._Q6i,i,i,];];+-+-R6S6._._._.:T6A*A*A*A*W%U6f_._._._d:V6W6X6Y69!`'Z6X%C#C#`6 78].7 # # # #+7b_._._._d:F)53F+F+F+F+&)._._4|35@#M+2+@#@#@#8@8@8@8@M+M+Z.Z.@7%<._._._+<#7P+P+o.o.o.o.r.r.8+8+8+8+8+$7c<%7&7*7=7-7b3d3e3N[p6p6p6t_t_;7>7f5,7t6'7)7[4R4R4!7x6~7{714g/]7^7/7(7~_/:(:H:_7H^V]I^2^J^4^%(%(Z]:7<7Q2R2!2[7}7|717s5//1:t(2<2<C3D32737' H + % + @                                                             ",
+"                                                            . + + + w-47^6d1U[U[w}x}y}y}$}$}$}$}%}%}6[6[6[J<J<J<57K3._._._/}67,|<2d477;|._._._/}87T^z(z(U^U^U^U^U^U^V^O{O{9707._._a7b7i,i,i,];];$=+-c7R3._._._d7e7A*A*A*A*W%f7V6._._._._._._._k1:3C1g7B>h79!i7D# # # # # # #j7.>h_._._._+1O>+#F+F+e'k7._U(l7|+@#2+2+@#@#@#8@8@8@8@M+M+Z.Z.m7#:._._._n7o7P+P+o.o.o.o.r.r.8+8+8+8+8+p7q7r7&7s7c3b3t7d3e3N[{<{<q<t_~1u7v7s6t6w7x7y7z7R4w6w6x6B_A7B7g/h/^7j/C7D7(:(:n5_7H^V]2^J^X]4^%(P:P:E7F7w3)2!2G7H7I7s5s5t/1:t(2<r|C3J7u/K7=#H + + #                                                               ",
+"                                                            . + + + a ;#L7d1d1Y2U[x}y}$}%}$}$}%}>(%}6[6[6[J<J<J<M7N7._._._._._._._._._._._._._e:O7z(W_z(U^U^U^U^U^U^V^O{O{P7Q7A5d4R7S7i,i,];r>+-y#+-+-T7._._._e:U7A*A*A*A*W%V7T{F1._._._._._._._._._._._`|<3@4W7X7 # # # # #.#Y7D1._._._5($>G+F+F+Z7:3._`7 8|+@#2+2+@#@#@#8@8@]%8@M+Z.O+Z..8F1._._._+8@8P+P+o.o.o.o.r.r.8+8+9+8+k.#8$8&7%8&8c3t7t7e3N[p6{<{<t_t_':':*8=8t6-8x7;8>8R4,8x6'8B_)8!8~8^7i/Z/{8]8^8H:_7_7V]I^2^J^4^4^%(Z]/8(8_8R2)2[7G7:8<8s5d^t/t(t(r|C3D3[8}8q]=#>.. + #                                                               ",
+"                                                            $ + + + + |818<[d1U[U[y}_2$}$}$}$}%}%}6[6[6[6[J<J<J<28A}._._._%<_638>|T3H648._._._d:58z(z(T^U^U^U^U^U^U^*^|{i,O{68788832i,i,i,];];9808e7a8b8._._._h_c8A*A*S*W%[@o&d8e8<3._._._._._._._._._._._._._33f8g8 # # # #E+h8P>h_._._._X|N~F+F+U|d:%<i8|+|+2+T.M+@#@#8@]%8@8@8@M+Z.Z.Z.j8U(._._._R(k8P+p.r.o.8+r.Q+s.9+8+8+l8m8n8r7&7o8p8U1t7q8e3r8p<p<s8t8u8j}v8w8x8w7-8t<=_y8z8!7x6'8B_C_A8B8C8j/Z/D8E8F8G8H^H^V]2^2^X]4^Y]P:H8I8J8w3)2K8G7L8M8N8d^e^t/t(2<r|r|D327O8$|H + > % +                                                               ",
+"                                                              + + & + a P8Q8d1d1/6/6y}$}$}$}$}%}%}6[6[6[6[J<J<G3R8S8._._._._T8U8V8W8X8F|Y8(}._._:}z(z(T^U^U^U^U^U^U^*^O{O{O{|{z*i,i,i,Z8`8 9.9+9@9[6._._._._._._#9S*A*A*W%W%o&o&$9%9&9g2}3._._._._._._._._._._._%<*9=9 # #.#F+E+-9Y|._._._#:;9F+i{j2._.:>9|+|+2+2+@#@#@#8@8@8@8@M+9@Z.Z. +,92(._._._S('9P+o.8+o.o.r.r.8+8+8+l8)9!9~9r7{9]9^9t7/9w2(9_9:9<9<9P*[9,[u_}9|9-8x7R/=_192939'8B_R[C_D_495969`/ (n(79899909I^2^J^a9b9c9d9e9P2Q2f9g9T2G7h9i9j9d^e^t(t(r|r|D327D3=:' H + + . ,.                                                              ",
+"                                                              # + + + + -#k9l9d1/6/6y}$}$}$}$}%}%}J<6[6[J<G3J<J<m9]|._._._._n9U:8:8:8:8:o9p9._._q9z(z(T^V^U^V^U^U^j^k^O{O{O{|{z*i,r9s9D5<3i_._._h_l1>|'3._._._._t9A*A*A*W%W%o&o&A#A#u9v9v1w9g7C1:3e:._._._._._._._f_x9 # #.#E+E+y9F)d:._._._F}`{z99|._k7A9|+@#M+2+@#@#@#8@8@8@8@M+M+Z.Z. +B9J}._._._e_C9P+o.o.o.o.r.r.8+8+D9)9E9F9r7&705G9H9t7t7e3I9J9K9@=@=O*~*j}v_v_L9M9t<R/b(c(N9O9'8B_C_)_D_U]P9Q9R9 (o(p(p/S9T9U9V9W9X9Y9Z9`9v3P2 0.0+0@0#0$0%0&0d^1:t(2<C3C3D327o}]6=#H + + @                                                                 ",
+"                                                                + + + + a *02_d1/6/6$}$}$}$}$}%}%}6[6[6[J<J<J<J<7:j[._._._._i[U:8:8:K<8:8:=0a7._-0z(z(U^V^U^U^U^U^;0>0O{O{O{|{,0'0l[/}._._%<<3H5)0!0~0{05(._._._]0A*A*A*W%Y@^0/0(0A#o&o&+*+*_0:0<0R;#~f8<3d:._._._._b6 # #.#E+F+E+[0c6._._._e:W{}0#:%<O~|+|+@#2+2+@#@#@#8@8@8@8@M+M+Z.Z.n.|0U(._._._5(10P+o.o.o.o.r.r.8+20)9304050r7{9056070t7w2e3809000a0{=t*~*b0}9c0d0x7R/=_-_c(S/e0f0g0h0)_D_i0j0k0l0m0n0p(@(q((_J_K2}<L2M2N2O2o0p0q0r0s0t0u0v0w0x0e^t(t(r|C3D3D3[8s8^]=#>.. $ *                                                                 ",
+"                                                                @ + + + a -#u+d1d1/6/6%}$}$}%}>(%}6[6[6[J<J<J<J<7:y0._._._._z0U:8:8:8:8:y/A0T3._B0W_z(U^U^U^U^U^C0D0E0F0G0O{H0I007._._._<3J0K0L0+-+-$=M0d2._._._N0A*A*A*W%W%U3g2O0P0o&+*^*+*+*+*,%B+C#Q0R0e]d2._._._S0 # #.#E+E+E+T0D,d:._._._0_0<._e_U0|+|+@#2+2+@#@#@#8@8@]%8@M+Z.O+Z. +K(e:._._._._V0n.o.o.o.o.r.r.W0)9X0Y0Z0`0&705 a.a+a@a#a$a%a&a*a=aO*t*`&-a;a>a,at<R/b(-_e/.2T/T4'a)aD_!_i0j0/:/:!a~a{a]ar(J_[:M:}<^a;2/a(a_a:a ^s0<aa^[a}a|a1a*(t(2<r|C3D3J72a3a' H + . + *                                                                 ",
+"                                                                % . + + + w-t|2_d14a/6$}$}$}%}%}6[6[6[6[J<J<J<7:>(5a._._._._]|L<K<8:8:8:y/6a7a_}8a9aT^U^U^U^U^0aaaba._cada|{eaf_._._._~}faga+-+-+-+-z#haf_._._._iajaS*W%[@o&v1F1i_s1ka+*C#C#D+laL.ma2@C#,%naoa._._._pa # #E+<+E+E+<+qara._._._n:Y|._0_sa|+|+2+T.M+@#@#8@]%8@8@8@M+Z.Z.Z. +ta%<._._._._+8uavaB[8+r.Q+waxayazaAaBar7{905a5b5CaDaEaFa{<GaHaIaO*~*F&Jat6w7x7t<=_-_Kay_LaF2MaW/NaD_E_j0G:/:(:H:OaPaQaRaSaTaUaVaWa21XaL^M_M_0^<aYaN^b^c^//e^u/t(r|C3D3D327a1Za=#H + + +                                                                   ",
+"                                                                  + + + + a T+`a bd1/6/6$}$}%}%}6[6[6[6[J<J<G37:7:.b._._._._S8+b8:8:8:8:y/T^@b#b$b%bT^U^U^U^U^&b~}._.:*bO{=bT3._._._-b;b>b];+-+-+-+-z#!0e_._._._'3,bA*W%W%o&'b)b._@9!bC#~b{b]b6@s&^b/+/b,%(b_b._._#::b #.#F+E+E+E+<+<bB>%<._._._%<%<+>|+|+|+2+2+@#@#@#8@8@8@8@M+9@6+[b}b|be6._._._._._d:V(=[1b2b3b4b)95b6b7b8b$8&7{9 aa5g}V}d5W}9b{<0babbbt*`&E&cbdbebfbgbhbibjbkblbg(mbnbob!_i0j0G:(:(:H:_7_7pbI^2^K^r/Y]5^Z]Z]`]M_ ^<a<aa^N^17//e^*(u/2<r|C3D3J72a)6qb=#H . + &                                                                   ",
+"                                                                  # + + + + |8rb2_ b/6/6$}$}%}%}J<6[6[J<G3J<J<7:7:sb`|._._._A}tb8:8:8:8:y/T^T^T^z(z(T^U^U^V^ubvb._._wbxbO{ybh_._._._l4zb];];+-+-+-+-z#Ab:3._._._BbCbA*W%W%o&Db'3._%<Eby1FbGbN]F F 6@HbB+D#IbJb._._9|Kb #.#E+E+E+E+<+[+Lb9|._._._._2(E,|+|+@#M+2+@#@#@#8@8@8@8@M+M+MbG}+1z[._._._._._._._._._._NbObPb)9QbRbSbTbUbVbWbXbYbZb`b cFa.cq<+c@c#c$cE&E&%c&c*c=cR4R4!7x6x6'_'_)_D_D_E_i0G:/:(:(:n5_7-c;c2^J^K^r/5^6^Z]L^M_M_0^<aYaN^b^c^//*(*(t(2<C3D3D3272a>c! H H + . +                                                                   ",
+"                                                                    * + & + a ,c'c b b/6$}$}%}%}6[6[6[J<J<J<J<7:7:)ck1._._._N7!c8:K<8:8:T^U^T^U^z(z(U^V^U^~c{ci_._%<]cO{O{^c._._._._E032];];$=+-+-$=/c(cd7._._._07_cA*W%W%o&o&y]._._h_,3:c<c[cF F F }cB+|ci2`|._e:b6s, #.#E+F+E+E+[+|+1c2c%<._._._0_3c|+|+@#2+2+@#@#@#8@8@8@8@M+M+4cz[5cn:U(2(@:+1f<6c7c5|8c9c0cacPb)9bcccdcecfcgchcicjckcw2lcp6{<q<mcncocZ&E&l&pcqc]1rcR4w6x6x6'8'8C_D_D_!_E_j0G:(:(:H:_7_7pb;c2^J^r/%(5^6^Z]`]`] ^<a<aYaN^b^c^t/*(*(2<r|C3D3sc2atcuc' > + + # &                                                                   ",
+"                                                                    + + + + & -#vc bd1/6/6%}>(%}6[6[6[J<J<J<J<7:7:wc^|._._._K3xc8:8:8:y/z(T^T^z(W_z(U^U^yczce:._._.:AcO{O{Bc._._._._m[Ccr>];+-+-+-Dc]0S3._._._._/}EcA*W%FcGco&HcF1._._._e_IcJcKcLcMcNcOc@4_}._d:Pc#4 # #.#E+E+E+E+[+[+F+Qc[5._._d:$>|+|+|+@#2+2+@#@#@#8@8@]%8@M+Z.RcScTcUcVcWc(('9XcYcZc`c d.d+dPbPbX03030@d#d#d$dc3U1d3e3w2lc{<q<t_%d&d*d=dE&P%+%-d;drcR4!7x6x6>d'_)_D_D_!_~_j0/:(:(:n5_7-cpb;cJ^K^r/%(6^6^L^M_M_0^<aYaYab^c^//1:*(t(2<C3C3J7,d2a'dL+=#> + # +                                                                     ",
+"                                                                      + + + + I )d>( b/6/6%}%}6[6[6[6[J<J<J<7:>(7:!d/}._._._{}M68:8:8:y/T^T^T^z(z(T^0a~d{d`|._._._]d^dO{|{/dk1._._._k1(d>5+-y#_d:dT7i_5(07._._._%<ia<d[d}dB1|d1d)b._.:.:%<2d3d4d5dQ}6dg_._._E17dN5 # # #E+<+E+E+<+}+[+F+d{8d._._:39dS.|+|+2+T.M+@#@#8@]%8@8@8@M+Z.Z.Z. + +Z.O+P+P+P+P+0dadbdcddds_Pb)930ed#d$d$dfdc3U1d3e3lcp<{<q<t_gdhdidjdl&P%+%kdldmdw6x6x6'8'_C_)_D_!_E_~_G:(:(:H:_7_7pb;c2^J^r/%(5^6^6^`]M_ ^0^<aYand17c^t/1:u/t(2<C3D3scscod&(pd> H . + +                                                                     ",
+"                                                                      ; $ + + a g^qd b b b b%}6[6[6[6[J<J<G37:7:U:rd_}._._.__}sd8:8:8:y/T^T^T^z(tdudvdn[d:._._._%<wdO{O{|{xdd4._._._._a7ydzdAdS6<3d:S3v>Bd/}._._._d:3(k1._g2CdDd'3._EdFdGdHdIdJd._._._%1:3@4KdLd.# # #.#F+E+E+E+<+[+F+F+F+Md:3._n7Nd|+|+|+2+2+@#@#@#8@8@8@8@M+9@Z.Z. +k. +`.O+P+OdPdQdRdRd.d+dddPbX030ed@d#d$dfdc3t7d3e3lcSd~<{<t_t_TdUdVdWdl&.%.%XdYdR4!7x6x6'8'_)_D_U]!_~_j0n}(:H:n5_7-cpb;c2^K^r/%(6^6^L^`]M_0^<aYaYab^17//1:*(u/2<C3C3J7,d2a'dZdq]> H + + #                                                                     ",
+"                                                                      + + + + + |8`d2_ b b b%}J<6[6[J<G3J<J<7:7:U: e._._._._._.e+e@e8:y/h1#e$e%e&eo[i_._._._._._l1*eO{O{|{z*-5!5._._._._._._%<._._07Bd=e-e;ef_._._._._5(,3>e,eA#4]'ee8S{)e!e~e{e]e^e/e(e_ea{ # # # # #.#E+E+E+E+<+[+F+F+F+:ef_d:<e@#|+|+@#M+2+@#@#@#8@8@8@8@M+M+Z.Z. + +M+S.[e}eQd|e1ebdbd+d2ePb3eX030ed#d#dfdfdc3U1d3e3w2lc{<{<t_~1Td4e5e6eP%.%0#7e8ew6x6x6'8'_C_)_D_!_E_~_j0(:(:H:Oa_7-c;c3^J^r/r/P:6^7^`]M_ ^0^<aYand17c^t/1:u/t(r|C3D3,d,d2a'd9e^]H H + + +                                                                     ",
+"                                                                        . + & + a 0e'c b b b b6[6[6[J<J<J<J<7:7:aebe._._._._._`|>|cedeeevbn[{}ba%<._._._._._._._m[feO{O{|{z*geheie/}._._._._k138'eje{3$=$=keleme+9+9T7{0w1o&A#A#neoe+*+*+*peqere'.<)6@seD+ # # # # # #.#E+F+E+E+[+|+F++#te%>._T(h{|+|+|+@#2+2+@#@#@#8@8@8@8@M+M+M+S.uep^veve}ewe|e|exebd.d+d2ePb3e3030@d#d$dfdfdU1U1e3N[lc~<{<t_t_TdTdyezeAeBe.%9#7eCeDex6'8'8'_C_D_!_!_E_~_/:(:H:n5_7-cpb;c3^K^r/%(Z]6^`]`]M_ ^<aYaYand17//t/1:t(2<C3C3J7,dEeod'dFe' > H D + &                                                                     ",
+"                                                                        $ + + + + |8Ge>( bm9 b6[6[6[J<J<J<HeIeH3Je^|._._._._._._._._._._._._._._._._._._._._._i_KeO{O{O{|{z*i,];Le-5MeNe'e]0OePeQez#z#$=$=$=A*ReSeTeW^W%o&o&B#A#o&+*^*+*+*UeVeWe;.F F XeYe # # # # # #.#E+E+E+E+[+[+F+F+ZeX|._15`e|+|+|+@#2+2+@#@#@#8@8@8@@#}+:+:+ fp^.fve+fweQd|e1exebd+d+d)93e>[30ed@d#dfdfdfdU1d3e3N[p<~<q<t_~1@fTd#f$f%f&f0#*f=f-fw6x6x6'8;f)_D_!_E_~_!/(:(:w<n5_7-c;c;cK^r/r/%(Z]7^L^`] ^0^<aYand>fc^t/1:t(t(r|C3D3,d,dEeod,f'f' > H + *                                                                       ",
+"                                                                          # + D + a )f!fm9 b b%}6[6[J<J<J<~fk[(}._._._._._._._._d:e:{f^}N3x5o[d4m[l[I|zc]f^f/fP6(fi,O{|{x#+-i,i,i,i,];];_fy#+-+-z#<@z#$=$=$=A*A*S*W%[@o&+*A#z+A#o&+*+*+*+*/b:f<f;.F F s&[fE+ # # # # #E+<+E+2@<+}+[+F+G+}fi_e:@>|+S.|+|+2+T.M+@#@#8@]%@#|+[+YeYe'% f4!.f+f|fwe|e|exebd.d+d+dPb1f>[30@d#d$dfdfd2fU1e3e3p6~<~<t_t_Td@f@f3f4f5f6f9#9#*f7fx6'8'8'_C_D_D_E_E_~_/:(:H:w<_7-c-c;c3^K^X]%(Z]6^8^`]M_ ^<aYand>f8f//t/1:t(2<r|C3J7,d2a2a'd*(9f=#> 0f+ +                                                                       ",
+"                                                                          . . + + a -#afm9^6 b b6[6[J<J<G3m9>}H6K3N7A},|bfcf!|dfefffgfhfifjfkflfmfnfofU^U^U^U^*^O{O{O{|{z*i,i,i,i,i,];];+-+-+-+-z#z#A*$=$=A*S*A*A*W%W%o&o&A#A#o&o&+*+*+*+*Z@pfqfrfF F 6@sfF+ #.# # #.#F+tfuf1}vfwfF+F+Ze9<._g:xf|+|+|+|+2+2+@#@#@#8@@#|+[+:+5/Ye fp^yf.fzf|fQdQd1exebdcd+d)9Pb>[30ed#d#dfdfdc3U1q8e3N[~<~<q<t_~1@f@fAfBfCfDfEf9#*fFfGfx6'8'_'_)_D_!_j0~_!//:Hfw<n5_7-c;c;cK^r/r/P:Z]7^`]M_M_0^M^a^N^b^c^d^e^IfN_JfKfLfLf[8MftcNfW]l>B B Of+ #                                                                       ",
+"                                                                            + + + + w-Pf!fm9Qf b6[J<G3J<J<7:x|RfxcSfTfUfU:8:8:8:8:8:y/T^T^T^z(z(T^U^U^V^U^U^j^k^O{O{O{|{z*i,i,i,i,i,];];+-+-+-+-z#z#$=$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*+*^*+*^*VfWfXfF F o$YfE+ # # # #.#x,15#:._n:z,ZfM~`fi_d2 g,)@#|+|+@#M+2+@#@#@#8@@#|+[+:+`_'% f4!.f+f|fwe|e|exexe.d+d2e)93e.g30@d#d$dfdc32fU1d3e3p6p<p<q<t_Td@f@f+g@g#g$g%g9#&gFf*gF:'_'_C_D_D_E_~_~_/:/:H:w<H^H^I^I^2^K^r/Y]5^6^6^`]M_ ^M^M^N^b^17=g(/-gu/r|_[C3J7272a2a'd;g>g,g> > H + +                                                                       ",
+"                                                                            + + + + a ;#qdm9^6 b bJ<J<J<J<7:7:U:U:i^i^U:U:8:8:K<8:8:T^U^T^U^z(z(U^V^U^U^U^U^V^O{O{O{O{|{z*i,i,i,i,i,];];$=+-+-$=W%z#$=$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*+*+*+*+*'g)gt[F F 6@!gE+ # # # #.#Md2(._._._5(b_F}h_._~g{g+#|+|+|+@#2+2+@#@#@#@#@#[+<+Ye`_'% fp^.f|f|fwe|e1execd+d+d)9)9>[.ged@d#dfdfdU12fd3e3N[{<~<q<t_~1Td@fAf@g]g^g/g(g*f_g_g:g<g[g[g}g)_D_E_j0j0/:(:(:w<H^V]2^2^X]K^r/5^6^7^`]M_M_0^M^a^b^b^c^t/*(*(2<r|@|a1J7272aod'd|g1g2g> > H + +                                                                       ",
+"                                                                            ,.+ + + + |83g'cm9 b bJ<J<J<J<7:7:U:U:i^i^U:U:8:8:8:8:y/z(T^T^z(W_z(U^U^U^U^U^U^V^O{O{O{O{|{z*i,];i,i,];r>];+-+-+-$=z#z#$=$=$=A*A*A*A*W%W%o&o&B#A#o&+*^*+*+*+*+*4g5g6g'.F 6@7g[+ # # # #.#8g3(._._._._._._._g:E,+#+#|+|+|+@#2+2+@#@#@#@#|+|+<+`_'%'%9g.f0g|f|fQd|e1exe+d+d2e)9X0>[.g@d#d#dfdc3c3U1e3w2p<~<~<q<t_':v8agagBfbgcgdgeg&g_gfggghgB_C_D_D_E_~_G:G:(:H:w<H^V]I^2^J^K^r/Y]5^6^7^9^9^s/ig+|B3jgkglgmgngogpgqgrgrgsgtgugvgX*wgxg> > > H + +                                                                       ",
+"                                                                              + + D + a yg`am9^6 bJ<J<J<7:>(7:U:i^y(i^U:8:K<8:8:8:y/T^T^T^z(z(T^U^U^U^U^U^U^*^|{i,O{|{x#+-i,i,i,i,];];+-y#+-+-z#<@z#$=$=$=A*A*S*W%[@o&+*A#z+A#o&+*+*+*+*+*B#zgAgBg;.F F &#[+ # # # #E+Cg~gd:._._._._%<0_Dg+#+#|+S.|+|+2+T.M+@#@#@#8@[+[+D+`_'% f9g.f0g|fEg|eRdbd.d.dFgPbPbGgHgIgIgJgKgfdc3U1d3e3lcp<~<x:t_~1~1':v8v_m|]1LgMgNg&g_gOggghgR[)_D_!_j0j0n}n}HfH2I:PgQgRgSgTgUgVgWgXgYgZg`g h.h+h@h#h$h%h&h*h=h-h**;h>h,h'hq$)h!h/ > > H H > H + +                                                                       ",
+"                                                                              * + + + & -#vcm9QfQfQfJ<G37:7:U:8:i^i^U:U:8:8:8:8:8:y/T^T^T^z(z(T^U^U^U^U^U^U^*^O{O{O{|{z*i,i,i,i,i,];];+-+-+-+-z#z#A*$=$=A*S*A*A*W%W%o&o&A#A#o&o&+*+*+*+*+*B#~h{h]hG*F F I#}+.# # #.#F+E+J~n2c6U(.:F}B>^hF++#+#|+|+|+|+2+2+@#2+M+2+S.}+}+/h(h_h_h:h<h[h}h|h1h1h2h3h4h5h6h6h3e7h.g#_8h8hfdc3U1d3w2p<~<x:x:t_~1v89hC2C20hk3ahbhch_gfgOgdhehfhghhhhhihjhkhlhmhnhohphqhrhshth^%uhvhwhxhyhzhAhBhCh> > > H > > > > $ $ $ $ $ $ $ $ + + + + + + + + +                                                                       ",
+"                                                                                + + + + w-Dh'cm9QfEhJ<J<7:7:U:U:i^i^U:U:8:8:8:8:8:y/T^T^T^z(z(T^U^U^V^U^U^j^k^O{O{O{|{z*i,i,i,i,i,];];+-+-+-+-z#z#$=$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*+*^*+*+*C#~hFhGbW.F F s&GhE+ # #.#E+E+E+d{Y79d9dHh35|+1+1+1+IhH+H+H+N+H+N+N+H+H+d!d!_+Ye`_p^4!4!yfJhJhT1KhRdbd.d+dFgPb3e>[>:#_#_Lh-7b3t7q8MhMhNhOhPhQh{#RhShThUhVhWhWhXhYhZh`&{=3=`h i.i+i@iyhq$#iv&Bh$i> > > H > > > > > $ $ $ $ $ $ $ $ $ + + + + + + + + + + + + + + + + + + + + + + + %                                                                       ",
+"                                                                                + + %i+ a Q^`am9m9QfJ<J<7:7:U:U:i^i^U:U:8:8:K<8:8:T^U^T^U^z(z(U^V^U^U^U^U^V^O{O{O{O{|{z*i,i,i,i,i,];];$=+-+-$=W%z#$=$=$=A*A*A*A*W%W%o&o&A#A#o&o&+*+*+*+*+*C#B+&i*i*=F F 6@=i1@|@|@|@|@G+G+G+G+1+G+1+1+1+|+@#|+@#2+2+2+M+2+M+M+2+S.}+}+YeYep^`_yf-i;i>i,i-1ado<o<'i)i!i~i{i]i^i/i(i_i:i<i[i}i|i1i+i2i@i3i4i5i6i7i8i9i!h$i=#A 0iF F F F ' =#> $ $ $ $ $ $ $ $ + + + + + + + + + + + + + + + + + + + + + + + + + + + & # + # # + # # + # # + . +                                                                       ",
+"                                                                                . + + + $ -#ai>(QfQf7:J<7:7:U:U:i^i^U:U:8:8:8:8:y/z(T^T^z(W_z(U^U^U^U^U^U^V^O{O{O{O{|{z*i,];i,i,];r>];+-+-+-$=z#z#$=$=$=A*A*W%W%o&A#A#A#x1x1x1x1bix1bibibibicidiei[cF F 6@fi[+E+E+E+<+[+[+[+}+|+[+|+|+|+|+@#|+T.T.T.T.)%9@9@)%)%gihiiijikiliminioipiqiriL#sitiuivi7iviwiAh8ixi9iyiziAiCh/ > / / / Bi/ > / > $ $ $ $ $ $ @ 0 F E =+=+=+; @ + + + + + + + + + + + + + + + + + + + + # # + # # + # * + # # + * . @ + + . . $ % - %                                                                                     ",
+"                                                                                  + + D + w-CiDiQfQfQf7:>(7:U:i^y(i^U:8:K<8:8:8:y/T^T^T^z(z(T^U^U^U^U^U^U^*^|{i,O{|{x#+-i,i,z*+-+-+-+-z#EiEiEiFiEiGiGiGiGiGiHiHij,j,x1j,A+B#B#B#C#B#C#C#C#,%}@IiJiKiF F o$Li[+<+<+[+:+}+}+}+R.R.MiO.NiM.OiPiQiRiSiTiUi~.!.).-#ViVi$iWiWiWiWiWi$iXiChCh/ / / / / > Bi/ / / / & $ & $ $ $ $ $ $ + + + + + + + + + + + + + + % + + @ + @ + + + + + + # # . # # + # * . . # $ # + + . . + + . + $ %                                                                                                                     ",
+"                                                                                  # + % + 3-Yiy(Ehm9Eh7:7:U:8:i^i^U:U:8:8:8:8:8:y/T^T^T^z(z(T^ZiZiZi`i`i`i*^da323232323232>b>b>b>b>b>bEiz#z#z#<@W%W%W%W%o&W%o&o&A#A#B#A#A+B#B#A+,%,%,%,%,%}@(h j.j+jF F 6@@jJ.I.#jG.$jc.]b%jJ b w-a > a a a a a / / / / / / / / / H / / / / / & & & & $ $ $ $ + + + + + + + + + + + + + + + + + + + + + + + + + + # # . . # $ & # + + # $ # + + # @ + + + . 8 .                                                                                                                                                     ",
+"                                                                                  . + + + / g^&j>(QfQf7:7:U:U:i^i^y/y/y/L<L<*j*j*j=j=j=j0a0a0a0a0a`i*^*^*^i,|{z*z*z*z*z*z*+-+-+-+-+-$=z#z#z#W%-j[@[@[@[@A#[@z+;j_h>j,j'j)j!j~j'+{j]j^jF./j%jJ J (jF F F F =+( a / / / / / / / / / / H / / / / & & & & & & $ $ + + + + + + + + + + + + + + + + + + + + + + + + + + & & + + # + + # + + # + + . + + . # @ . + @ +                                                                                                                                                                                     ",
+"                                                                                    . + D + -#_jDiDiEhEhDiDiDiDiL<L<L<L<y/T^T^T^z(Ziz(Zi:jZiZi*^Zi*^*^*^*^z*z*x#x#_@y#y#z#<@-jy+<j<j[j}j|jji1j2j3j,+>+^j;+-+D.f+b b a a a a a a a / / / / / / > 4jF F F E =+> & & & & & & & $ $ + + + + + + + + + + + + + + + + + + + + + + + + + + # # + # # + # # + # # + * . + + * @ # + @ . .                                                                                                                                                                                                                   ",
+"                                                                                    + # + + w-5ji^i^Dii^i^i^i^y(y/y/y/T^y/T^z(z(W_:j:jda686868W@W@6j[h7j8j9j0jajbjcjdjh+;+ejg+g+-#-#a a a a a a a / / / / / / / / > Bi/ / / / & & & & & & & $ 9 0 E fj=+0 + + + + + + + + + + + + + + + + + + + + + # # + # # + # * . # # + * + + . + + * % % # @                                                                                                                                                                                                                                                   ",
+"                                                                                    . + % + / gj`a!fhjy(y(W_ij&j&jjj6jkjlj5jmjnjgj)dojpjqj^2T+g+-#-#a d+d+a a a a a / / / / / / / / H / / / / & & & & & & & & $ + + + + + + + + + + + + + + + + $ @ $ @ + + + + + + # # . # # + # * . . & $ # + + + + $ # @ @ * ;                                                                                                                                                                                                                                                                                   ",
+"                                                                                    + + + + / rjDhPfsjtjuj^2T+g+-#-#a e+d+d+a a a a / / / / / / / / H / / / / & & & & & & & & & + + + + + + + + + + + + + + + + + + + + + + + + + + # # . . * + & # + + # $ # + + # @ + + + . + .                                                                                                                                                                                                                                                                                                                   ",
+"                                                                                    + . + + > / a a / / / / / / / / H / / / / / & & & & & & & & + + + + + + + + + + + + + + + + + + + + + + + + + + # & + + # + & # + + # + # + + . . # % - * % @                                                                                                                                                                                                                                                                                                                                                   ",
+"                                                                                    + + + D Bi/ & & & & & & & & + + + + + + + + + + + + + + + + + + + + + + + + + + & & + + # + + # + + # # + . + + @ $ + + + . $                                                                                                                                                                                                                                                                                                                                                                                   ",
+"                                                                                    & + + + + + + + + + + + + + + + + + + + + + + + + & # + # # + # # + # # + * . + + # $ # + @ . .                                                                                                                                                                                                                                                                                                                                                                                                                 ",
+"                                                                                      + + + + + + + + # # + # # + # * + # # + * . @ + + . . $ % # %                                                                                                                                                                                                                                                                                                                                                                                                                                                 ",
+"                                                                                      $ + + + * + + . % @ . - & . ,.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ",
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    "};
diff --git a/pixmaps/artist_album.xpm b/pixmaps/artist_album.xpm
index 71b2c1a..a587ffe 100755..100644
--- a/pixmaps/artist_album.xpm
+++ b/pixmaps/artist_album.xpm
@@ -1,329 +1,295 @@
 /* XPM */
 static char * artist_album_xpm[] = {
-"24 24 302 2",
+"24 24 268 2",
 "  	c None",
-". 	c #52483D",
-"+ 	c #382C20",
-"@ 	c #20150C",
-"# 	c #1D120A",
-"$ 	c #281A0E",
-"% 	c #43392D",
-"& 	c #52483C",
-"* 	c #433B32",
-"= 	c #8F7F6E",
-"- 	c #96816A",
-"; 	c #58412B",
-"> 	c #3D2816",
-", 	c #362312",
-"' 	c #332212",
-") 	c #594633",
-"! 	c #72604C",
-"~ 	c #4B4033",
-"{ 	c #16110B",
-"] 	c #362F27",
-"^ 	c #84725E",
-"/ 	c #856F57",
-"( 	c #89735A",
-"_ 	c #563F29",
-": 	c #3E2917",
-"< 	c #362211",
-"[ 	c #2C1D10",
-"} 	c #302215",
-"| 	c #493624",
-"1 	c #533E29",
-"2 	c #322518",
-"3 	c #080603",
-"4 	c #52463A",
-"5 	c #7A644C",
-"6 	c #89725A",
-"7 	c #7D654B",
-"8 	c #694F35",
-"9 	c #442E1A",
-"0 	c #322010",
-"a 	c #352619",
-"b 	c #594938",
-"c 	c #63503D",
-"d 	c #533F2C",
-"e 	c #42301F",
-"f 	c #1D140C",
-"g 	c #000000",
-"h 	c #483B2D",
-"i 	c #775E44",
-"j 	c #866C51",
-"k 	c #91795E",
-"l 	c #573F29",
-"m 	c #362212",
-"n 	c #312113",
-"o 	c #635343",
-"p 	c #9E8975",
-"q 	c #A08972",
-"r 	c #78624D",
-"s 	c #4F3D2C",
-"t 	c #312316",
-"u 	c #433527",
-"v 	c #392A1C",
-"w 	c #735A40",
-"x 	c #816B54",
-"y 	c #654B32",
-"z 	c #3A2616",
-"A 	c #4C3A28",
-"B 	c #564737",
-"C 	c #AE9A87",
-"D 	c #DFC7AD",
-"E 	c #D0B598",
-"F 	c #A68B70",
-"G 	c #76614C",
-"H 	c #594937",
-"I 	c #977E65",
-"J 	c #6A533D",
-"K 	c #7C6145",
-"L 	c #654C33",
-"M 	c #372515",
-"N 	c #513E2D",
-"O 	c #423425",
-"P 	c #816F5D",
-"Q 	c #D3BCA3",
-"R 	c #E9CDAF",
-"S 	c #C3A78A",
-"T 	c #89735C",
-"U 	c #5A4A3A",
-"V 	c #45382B",
-"W 	c #8D7761",
-"X 	c #604C38",
-"Y 	c #61482E",
-"Z 	c #4D3722",
-"` 	c #392A1D",
-" .	c #312C27",
-"..	c #262727",
-"+.	c #675E53",
-"@.	c #A2907C",
-"#.	c #97846F",
-"$.	c #63574B",
-"%.	c #3F3B37",
-"&.	c #3A342E",
-"*.	c #3A3024",
-"=.	c #89725C",
-"-.	c #5D4A38",
-";.	c #4A3623",
-">.	c #6A533C",
-",.	c #8B735A",
-"'.	c #5D544A",
-").	c #474645",
-"!.	c #766C61",
-"~.	c #6B5D4E",
-"{.	c #413932",
-"].	c #4C453E",
-"^.	c #4E463D",
-"/.	c #483E35",
-"(.	c #5A504D",
-"_.	c #73685F",
-":.	c #5D544E",
-"<.	c #8D765D",
-"[.	c #7E6750",
-"}.	c #7E654C",
-"|.	c #B69675",
-"1.	c #DCBB98",
-"2.	c #C3AC97",
-"3.	c #B3A494",
-"4.	c #C5B3A1",
-"5.	c #D6BFA6",
-"6.	c #806F5E",
-"7.	c #53473C",
-"8.	c #6B5E50",
-"9.	c #675A4C",
-"0.	c #5B4F46",
-"a.	c #786B66",
-"b.	c #94877A",
-"c.	c #8E8176",
-"d.	c #AD9F8C",
-"e.	c #565243",
-"f.	c #A18568",
-"g.	c #BF9E7B",
-"h.	c #EAC49B",
-"i.	c #FAD4AE",
-"j.	c #E8CCB0",
-"k.	c #F1D8BF",
-"l.	c #F6DEC4",
-"m.	c #E4CAAE",
-"n.	c #877461",
-"o.	c #55483B",
-"p.	c #67594B",
-"q.	c #6B5D50",
-"r.	c #695C52",
-"s.	c #91817A",
-"t.	c #AD9E8E",
-"u.	c #BAA998",
-"v.	c #B0A58B",
-"w.	c #736F55",
-"x.	c #524D3C",
-"y.	c #B59776",
-"z.	c #E7C097",
-"A.	c #F5CDA4",
-"B.	c #C6AA8D",
-"C.	c #BFA890",
-"D.	c #D9BFA3",
-"E.	c #CBAF91",
-"F.	c #87725B",
-"G.	c #564738",
-"H.	c #544639",
-"I.	c #605347",
-"J.	c #73675F",
-"K.	c #9B8C85",
-"L.	c #B2A597",
-"M.	c #BEB099",
-"N.	c #A6A07D",
-"O.	c #A09675",
-"P.	c #7C705F",
-"Q.	c #6F5C47",
-"R.	c #BD9C7A",
-"S.	c #E2BA92",
-"T.	c #BD9D7C",
-"U.	c #8C765E",
-"V.	c #927C65",
-"W.	c #927960",
-"X.	c #77624C",
-"Y.	c #584838",
-"Z.	c #483B2F",
-"`.	c #554A40",
-" +	c #7A726C",
-".+	c #9B918B",
-"++	c #AFA69C",
-"@+	c #C1B9A1",
-"#+	c #AFA586",
-"$+	c #C6B59D",
-"%+	c #C5B4A3",
-"&+	c #978E83",
-"*+	c #3D3327",
-"=+	c #7C664F",
-"-+	c #B59574",
-";+	c #D3AD87",
-">+	c #B79574",
-",+	c #6F5B47",
-"'+	c #4D3F30",
-")+	c #46392C",
-"!+	c #42362A",
-"~+	c #42352B",
-"{+	c #554B43",
-"]+	c #736E6B",
-"^+	c #6F6C69",
-"/+	c #807D78",
-"(+	c #CECABC",
-"_+	c #D6C8B7",
-":+	c #E2D7C7",
-"<+	c #E2DFCE",
-"[+	c #87877E",
-"}+	c #3E3327",
-"|+	c #6A5744",
-"1+	c #9E8164",
-"2+	c #B69473",
-"3+	c #A08265",
-"4+	c #8F745A",
-"5+	c #806851",
-"6+	c #63503E",
-"7+	c #483B30",
-"8+	c #504944",
-"9+	c #605C5B",
-"0+	c #2C2828",
-"a+	c #3A3738",
-"b+	c #C9C7C3",
-"c+	c #D8D9CD",
-"d+	c #CFD3C7",
-"e+	c #CACFC4",
-"f+	c #848781",
-"g+	c #241D17",
-"h+	c #4B3E2F",
-"i+	c #6A5642",
-"j+	c #76604A",
-"k+	c #725C47",
-"l+	c #614E3C",
-"m+	c #46382C",
-"n+	c #382F28",
-"o+	c #534D48",
-"p+	c #73716C",
-"q+	c #504E4B",
-"r+	c #636160",
-"s+	c #E3DDDA",
-"t+	c #DBD4CB",
-"u+	c #CECBBC",
-"v+	c #C6C3B0",
-"w+	c #79776A",
-"x+	c #020101",
-"y+	c #100D0A",
-"z+	c #1B1611",
-"A+	c #221B15",
-"B+	c #28211C",
-"C+	c #2D2822",
-"D+	c #3E3931",
-"E+	c #615C4E",
-"F+	c #918D7D",
-"G+	c #D3CFC9",
-"H+	c #E3E2DC",
-"I+	c #F1E1D7",
-"J+	c #EDDACC",
-"K+	c #EAD6D2",
-"L+	c #D6CBC8",
-"M+	c #666363",
-"N+	c #030202",
-"O+	c #040303",
-"P+	c #1D1917",
-"Q+	c #423D34",
-"R+	c #595544",
-"S+	c #6E6852",
-"T+	c #A09482",
-"U+	c #CFCBBD",
-"V+	c #C6C5B5",
-"W+	c #E6D8D3",
-"X+	c #ECD9C9",
-"Y+	c #ECD9C7",
-"Z+	c #A99A93",
-"`+	c #3F3939",
-" @	c #0F0E0C",
-".@	c #2E2C22",
-"+@	c #5D5943",
-"@@	c #8E826B",
-"#@	c #C3B3A4",
-"$@	c #D4D4C5",
-"%@	c #C2C2B1",
-"&@	c #D9D4CC",
-"*@	c #EAD5CF",
-"=@	c #BDAD9F",
-"-@	c #554D47",
-";@	c #181813",
-">@	c #37332A",
-",@	c #7D7063",
-"'@	c #C2B5A8",
-")@	c #CFD4C5",
-"!@	c #BBBDAF",
-"~@	c #B2B0A2",
-"{@	c #938988",
-"]@	c #4E4744",
-"^@	c #544B44",
-"/@	c #58534D",
-"(@	c #62645E",
-"_@	c #575953",
-":@	c #494842",
-"<@	c #302C2D",
-"                                                ",
-"                                                ",
-"            . + @ # $ % &                       ",
-"        * = - ; > , ' ) ! ~ {                   ",
-"      ] ^ / ( _ : < [ } | 1 2 3                 ",
-"      4 5 6 7 8 9 0 a b c d e f g               ",
-"      h i j k l m n o p q r s t                 ",
-"    u v w x y z A B C D E F G H                 ",
-"    I J K L M N O P Q R S T U V                 ",
-"    W X Y Z `  ...+.@.#.$.%.&.*.                ",
-"    =.-.;.>.,.'.).!.@.~.{.].^./.(._.:.          ",
-"    <.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.      ",
-"      f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.    ",
-"        y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.    ",
-"        Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+  ",
-"        *+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+  ",
-"          }+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+  ",
-"            g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+  ",
-"              x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+  ",
-"                  N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+  ",
-"                       @.@+@@@#@$@%@&@*@=@-@    ",
-"                        ;@>@,@'@)@!@~@{@]@      ",
-"                            ^@/@(@_@:@<@        ",
-"                                                "};
+". 	c #251E00",
+"+ 	c #2E2600",
+"@ 	c #2A2200",
+"# 	c #251F00",
+"$ 	c #272106",
+"% 	c #86762A",
+"& 	c #E2C536",
+"* 	c #F7D635",
+"= 	c #F7D42C",
+"- 	c #E9C51D",
+"; 	c #AC9007",
+"> 	c #231D00",
+", 	c #252006",
+"' 	c #B19E44",
+") 	c #F9DE5F",
+"! 	c #F9E16B",
+"~ 	c #F9E16A",
+"{ 	c #F9DE5D",
+"] 	c #F8D947",
+"^ 	c #DAB70E",
+"/ 	c #302700",
+"( 	c #595025",
+"_ 	c #F9E069",
+": 	c #FAE787",
+"< 	c #FBEB9F",
+"[ 	c #FBEB9D",
+"} 	c #FAE685",
+"| 	c #F9E066",
+"1 	c #F8D944",
+"2 	c #F6D222",
+"3 	c #D1AE00",
+"4 	c #BDA73E",
+"5 	c #F9E26F",
+"6 	c #FBE890",
+"7 	c #FCEEAE",
+"8 	c #FCEEAC",
+"9 	c #FBE88D",
+"0 	c #F6D742",
+"a 	c #D6B411",
+"b 	c #F5CC03",
+"c 	c #332A00",
+"d 	c #221C00",
+"e 	c #D2B62E",
+"f 	c #E5C736",
+"g 	c #EACD42",
+"h 	c #FAE47D",
+"i 	c #F9E16D",
+"j 	c #F8DC55",
+"k 	c #E5C52E",
+"l 	c #110F03",
+"m 	c #F3C900",
+"n 	c #6C5900",
+"o 	c #7F6B0B",
+"p 	c #342C0F",
+"q 	c #372F15",
+"r 	c #C2A30D",
+"s 	c #F6D533",
+"t 	c #F7D638",
+"u 	c #F7D42D",
+"v 	c #D5B310",
+"w 	c #0C0A06",
+"x 	c #B49500",
+"y 	c #3A3000",
+"z 	c #1B1606",
+"A 	c #7E6D5C",
+"B 	c #9A8575",
+"C 	c #615340",
+"D 	c #42391C",
+"E 	c #4D4013",
+"F 	c #504313",
+"G 	c #443910",
+"H 	c #514538",
+"I 	c #241F0A",
+"J 	c #241E00",
+"K 	c #282320",
+"L 	c #EACAB3",
+"M 	c #E8C7B1",
+"N 	c #E6C6AF",
+"O 	c #E3C3AD",
+"P 	c #E0C1AB",
+"Q 	c #DABCA7",
+"R 	c #D6B8A3",
+"S 	c #D7B9A4",
+"T 	c #53473F",
+"U 	c #241F1C",
+"V 	c #CEB19D",
+"W 	c #F4D2BA",
+"X 	c #342D29",
+"Y 	c #979797",
+"Z 	c #999999",
+"` 	c #372F29",
+" .	c #F3D1B9",
+"..	c #9D8678",
+"+.	c #1C1816",
+"@.	c #919191",
+"#.	c #6E6E6E",
+"$.	c #606060",
+"%.	c #5D5D5D",
+"&.	c #646464",
+"*.	c #6D6D6D",
+"=.	c #7A7A7A",
+"-.	c #A2A2A2",
+";.	c #091723",
+">.	c #101923",
+",.	c #9A8577",
+"'.	c #E9C8B1",
+").	c #6F5F55",
+"!.	c #0B1319",
+"~.	c #8C8C8C",
+"{.	c #676767",
+"].	c #6C6C6C",
+"^.	c #737373",
+"/.	c #818181",
+"(.	c #888888",
+"_.	c #909090",
+":.	c #A8A8A8",
+"<.	c #081724",
+"[.	c #62A0D9",
+"}.	c #60A0DB",
+"|.	c #204567",
+"1.	c #10171E",
+"2.	c #2F2A27",
+"3.	c #2B2723",
+"4.	c #615F5F",
+"5.	c #14324E",
+"6.	c #182836",
+"7.	c #8A8A8A",
+"8.	c #989898",
+"9.	c #9E9E9E",
+"0.	c #A5A5A5",
+"a.	c #ACACAC",
+"b.	c #B3B3B3",
+"c.	c #B9B9B9",
+"d.	c #C0C0C0",
+"e.	c #CACACA",
+"f.	c #275379",
+"g.	c #A0C9EE",
+"h.	c #A9CEEF",
+"i.	c #99C5ED",
+"j.	c #5280AB",
+"k.	c #232A31",
+"l.	c #FFFFFF",
+"m.	c #66696A",
+"n.	c #225C92",
+"o.	c #245F96",
+"p.	c #5B5F62",
+"q.	c #9F9F9F",
+"r.	c #A6A6A6",
+"s.	c #ADADAD",
+"t.	c #B4B4B4",
+"u.	c #BBBBBB",
+"v.	c #C1C1C1",
+"w.	c #C8C8C8",
+"x.	c #CFCFCF",
+"y.	c #D6D6D6",
+"z.	c #DCDCDC",
+"A.	c #E5E5E5",
+"B.	c #07141F",
+"C.	c #679ED1",
+"D.	c #B7D6F2",
+"E.	c #CCE2F6",
+"F.	c #AED1F0",
+"G.	c #8FBFEB",
+"H.	c #3B658D",
+"I.	c #1C2329",
+"J.	c #0C1823",
+"K.	c #3187D5",
+"L.	c #2E3944",
+"M.	c #B5B5B5",
+"N.	c #C2C2C2",
+"O.	c #BDBDBD",
+"P.	c #BCBCBC",
+"Q.	c #DBDBDB",
+"R.	c #E4E4E4",
+"S.	c #EBEBEB",
+"T.	c #F2F2F2",
+"U.	c #F8F8F8",
+"V.	c #081622",
+"W.	c #7CB4E7",
+"X.	c #A7CDEF",
+"Y.	c #AFD1F0",
+"Z.	c #A1C9EE",
+"`.	c #88BBEA",
+" +	c #6CABE4",
+".+	c #3879B4",
+"++	c #2E7DC5",
+"@+	c #328ADA",
+"#+	c #2B3946",
+"$+	c #D1D1D1",
+"%+	c #CCCCCC",
+"&+	c #D5D5D5",
+"*+	c #E0E0E0",
+"=+	c #E2E2E2",
+"-+	c #F9F9F9",
+";+	c #8B8B8B",
+">+	c #636363",
+",+	c #0A1D2E",
+"'+	c #6EACE5",
+")+	c #86BAE9",
+"!+	c #8BBDEA",
+"~+	c #84B9E9",
+"{+	c #72AFE6",
+"]+	c #5CA2E2",
+"^+	c #4394DD",
+"/+	c #2C3C4B",
+"(+	c #DFDFDF",
+"_+	c #E6E6E6",
+":+	c #E8E8E8",
+"<+	c #767676",
+"[+	c #858585",
+"}+	c #AAAAAA",
+"|+	c #0A1B2B",
+"1+	c #58A0E1",
+"2+	c #65A7E3",
+"3+	c #68A9E4",
+"4+	c #63A6E3",
+"5+	c #569FE1",
+"6+	c #4495DD",
+"7+	c #2E3B47",
+"8+	c #F4F4F4",
+"9+	c #FBFBFB",
+"0+	c #616161",
+"a+	c #7C7C7C",
+"b+	c #929292",
+"c+	c #9C9C9C",
+"d+	c #A7A7A7",
+"e+	c #B2B2B2",
+"f+	c #C4C4C4",
+"g+	c #07131E",
+"h+	c #2A6BA5",
+"i+	c #4293DD",
+"j+	c #4092DD",
+"k+	c #378DDB",
+"l+	c #286DAD",
+"m+	c #282F36",
+"n+	c #686868",
+"o+	c #7E7E7E",
+"p+	c #939393",
+"q+	c #AFAFAF",
+"r+	c #BEBEBE",
+"s+	c #C9C9C9",
+"t+	c #D4D4D4",
+"u+	c #06121C",
+"v+	c #163D61",
+"w+	c #2669A6",
+"x+	c #3186D4",
+"y+	c #3085D2",
+"z+	c #20588B",
+"A+	c #212A33",
+"B+	c #777777",
+"C+	c #959595",
+"D+	c #A0A0A0",
+"E+	c #CBCBCB",
+"F+	c #DEDEDE",
+"G+	c #B6B6B6",
+"H+	c #081521",
+"I+	c #0B1D2F",
+"J+	c #0D2439",
+"K+	c #0B2032",
+"L+	c #B7B7B7",
+"M+	c #D7D7D7",
+"N+	c #DDDDDD",
+"O+	c #D0D0D0",
+"P+	c #D8D8D8",
+"Q+	c #D9D9D9",
+"R+	c #B1B1B1",
+"S+	c #B8B8B8",
+"        . + @ #                                 ",
+"    $ % & * = - ; >                             ",
+"  , ' ) ! ~ { ] = ^ /                           ",
+"  ( _ : < [ } | 1 2 3 >                         ",
+"  4 5 6 7 8 9 ! 0 a b c                         ",
+"d e f g h h i j k l m n                         ",
+"  o p q r s t u v w x y                         ",
+"  z A B C D E F G H I J                         ",
+"  K L M N O P Q R S T                           ",
+"  U V W W W W W W W X         Y Z               ",
+"    `  .W W W W W ..+.  @.#.$.%.&.*.=.-.        ",
+"    ;.>.,.W W '.).!.  ~.{.].^.=./.(._.Y :.      ",
+"  <.[.}.|.1.2.3.4.5.6.=.7.@.8.9.0.a.b.c.d.e.    ",
+"  f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A.  ",
+"B.C.D.E.F.G.H.I.J.K.K.L.M.u.N.O.P.e.Q.R.S.T.U.w.",
+"V.W.X.Y.Z.`. +.+++@+@+#+e.$+%+&+*+=+y.-+;+>+#.8.",
+",+'+)+!+~+{+]+^+@+@+@+/+(+_+y.:+      <+=.[+_.}+",
+"|+1+2+3+4+5+6+@+@+@+@+7+8+9+0+      a+b+c+d+e+f+",
+"g+h+i+6+j+k+@+@+@+@+l+m+n+^.o+b+8.p+q+t.r+s+t+Q.",
+"  u+v+w+x+@+@+@+y+z+A+B+7.C+D+}+M.d.E+y.F+F+F+G+",
+"        H+I+J+K+H+    }+a.L+v.%+M+F+F+F+F+F+N+  ",
+"                        O+P+F+F+F+F+F+F+F+(+    ",
+"                          e.F+F+F+F+F+F+Q+      ",
+"                              R+N.x.S+          "};
diff --git a/pixmaps/scan.xpm b/pixmaps/scan.xpm
index 85cac3a..08fdf4c 100755..100644
--- a/pixmaps/scan.xpm
+++ b/pixmaps/scan.xpm
@@ -1,44 +1,265 @@
 /* XPM */
 static char * scan_xpm[] = {
-"20 20 21 1",
-" 	c None",
-".	c #008000",
-"+	c #31BC31",
-"@	c #98FF98",
-"#	c #BBF7BB",
-"$	c #015101",
-"%	c #A7E5A7",
-"&	c #C8F7C8",
-"*	c #00E800",
-"=	c #94D394",
-"-	c #00FF00",
-";	c #CEFFCE",
-">	c #66C966",
-",	c #D7EFD7",
-"'	c #000000",
-")	c #F5F5DC",
-"!	c #BEBEAB",
-"~	c #D8D8C2",
-"{	c #818174",
-"]	c #2BB52B",
-"^	c #1FCD1F",
-"          ....      ",
-"         +.@@.      ",
-"       ++#$@@.      ",
-"     ++%#&.*@.      ",
-"   ++%###&.*@.      ",
-"  ++=###&&.-*.      ",
-"  +;>%##&,.--$      ",
-"  +;;>%#&,.--.'     ",
-"  +;;>%#&,.--.'     ",
-"  +;>=%#&,.--.)'    ",
-"  ++=%##&,.--.)!'   ",
-"  +=%###&,.--.))~'  ",
-"   +%###&,.--.)){'  ",
-"   +%###&,.--.)''   ",
-"    +###&&.--.''    ",
-"    +%###&.-*$      ",
-"     ]%###.*@.      ",
-"      +#%^$@@.      ",
-"       ++ .@@.      ",
-"          ....      "};
+"24 24 238 2",
+"  	c None",
+". 	c #367A02",
+"+ 	c #68B708",
+"@ 	c #6DB405",
+"# 	c #4A6E23",
+"$ 	c #428C01",
+"% 	c #96FF00",
+"& 	c #A3FF00",
+"* 	c #385A0C",
+"= 	c #677148",
+"- 	c #A2B76E",
+"; 	c #9EB670",
+"> 	c #99B571",
+", 	c #93B372",
+"' 	c #90B374",
+") 	c #8CB276",
+"! 	c #87B178",
+"~ 	c #82B079",
+"{ 	c #539020",
+"] 	c #97FF00",
+"^ 	c #A4FF00",
+"/ 	c #55772A",
+"( 	c #7A7A7A",
+"_ 	c #5C5C5C",
+": 	c #8B995F",
+"< 	c #DCF995",
+"[ 	c #D6F797",
+"} 	c #CFF599",
+"| 	c #C9F49B",
+"1 	c #C4F39D",
+"2 	c #BDF19F",
+"3 	c #B7F0A1",
+"4 	c #B1EFA4",
+"5 	c #6AA73A",
+"6 	c #A5FF00",
+"7 	c #7C9E51",
+"8 	c #D0D0D0",
+"9 	c #A9A9A9",
+"0 	c #9B9B9B",
+"a 	c #D8F999",
+"b 	c #D2F89C",
+"c 	c #CAF59C",
+"d 	c #C5F49E",
+"e 	c #BFF3A1",
+"f 	c #B9F2A3",
+"g 	c #B2F0A5",
+"h 	c #6CA73A",
+"i 	c #98FF00",
+"j 	c #A6FF00",
+"k 	c #7D9F52",
+"l 	c #D3D3D3",
+"m 	c #ADADAD",
+"n 	c #E9E9E9",
+"o 	c #969696",
+"p 	c #8A985F",
+"q 	c #DBF894",
+"r 	c #D3F99D",
+"s 	c #CCF79E",
+"t 	c #C7F6A0",
+"u 	c #C0F4A2",
+"v 	c #BBF4A5",
+"w 	c #B4F2A7",
+"x 	c #6CA83C",
+"y 	c #99FF00",
+"z 	c #A7FF00",
+"A 	c #7EA053",
+"B 	c #D6D6D6",
+"C 	c #EFEFEF",
+"D 	c #E8E8E8",
+"E 	c #939393",
+"F 	c #D7F898",
+"G 	c #CDF89F",
+"H 	c #C8F7A1",
+"I 	c #C2F6A4",
+"J 	c #BCF5A6",
+"K 	c #B6F4A9",
+"L 	c #6DA83D",
+"M 	c #9AFF00",
+"N 	c #A8FF00",
+"O 	c #80A154",
+"P 	c #DADADA",
+"Q 	c #DDDDDD",
+"R 	c #D1D1D1",
+"S 	c #C9C9C9",
+"T 	c #808080",
+"U 	c #89975D",
+"V 	c #DAF793",
+"W 	c #CEF9A0",
+"X 	c #C3F7A5",
+"Y 	c #BDF6A7",
+"Z 	c #B7F5AA",
+"` 	c #6FA93E",
+" .	c #9BFF00",
+"..	c #A9FF00",
+"+.	c #81A355",
+"@.	c #CECECE",
+"#.	c #BEBEBE",
+"$.	c #C8C8C8",
+"%.	c #C5C5C5",
+"&.	c #A3A3A3",
+"*.	c #414141",
+"=.	c #C9F8A2",
+"-.	c #BEF7A8",
+";.	c #B9F7AC",
+">.	c #70A93F",
+",.	c #9CFF00",
+"'.	c #82A456",
+").	c #E1E1E1",
+"!.	c #DEDEDE",
+"~.	c #DBDBDB",
+"{.	c #D9D9D9",
+"].	c #BDBDBD",
+"^.	c #424242",
+"/.	c #88965C",
+"(.	c #D9F692",
+"_.	c #D1F79B",
+":.	c #CAF9A3",
+"<.	c #70AA41",
+"[.	c #9DFF00",
+"}.	c #AAFF00",
+"|.	c #83A557",
+"1.	c #E4E4E4",
+"2.	c #DFDFDF",
+"3.	c #DCDCDC",
+"4.	c #C1C1C1",
+"5.	c #444444",
+"6.	c #D5F696",
+"7.	c #C4F8A6",
+"8.	c #71AA41",
+"9.	c #ABFF00",
+"0.	c #85A557",
+"a.	c #E5E5E5",
+"b.	c #E2E2E2",
+"c.	c #C4C4C4",
+"d.	c #87955C",
+"e.	c #D8F591",
+"f.	c #D4F595",
+"g.	c #D0F69A",
+"h.	c #C5F9A7",
+"i.	c #C0F9AA",
+"j.	c #BBF9AE",
+"k.	c #72AA42",
+"l.	c #9EFF00",
+"m.	c #ACFF00",
+"n.	c #86A759",
+"o.	c #EBEBEB",
+"p.	c #E3E3E3",
+"q.	c #E0E0E0",
+"r.	c #C6C6C6",
+"s.	c #454545",
+"t.	c #D7F490",
+"u.	c #BCFAAF",
+"v.	c #73AB43",
+"w.	c #9FFF00",
+"x.	c #ADFF00",
+"y.	c #89AA5B",
+"z.	c #F2F2F2",
+"A.	c #ECECEC",
+"B.	c #E6E6E6",
+"C.	c #CACACA",
+"D.	c #D3F494",
+"E.	c #CBF69D",
+"F.	c #73AA43",
+"G.	c #A0FF00",
+"H.	c #AEFF00",
+"I.	c #89AB5C",
+"J.	c #F9F9F9",
+"K.	c #F7F7F7",
+"L.	c #EEEEEE",
+"M.	c #EAEAEA",
+"N.	c #E7E7E7",
+"O.	c #CDCDCD",
+"P.	c #464646",
+"Q.	c #BFF8A9",
+"R.	c #73AA44",
+"S.	c #A1FF00",
+"T.	c #AFFF00",
+"U.	c #F8F8F8",
+"V.	c #FAFAFA",
+"W.	c #F1F1F1",
+"X.	c #CEF498",
+"Y.	c #BAF8AD",
+"Z.	c #73A943",
+"`.	c #A2FF00",
+" +	c #88A95A",
+".+	c #FBFBFB",
+"++	c #F3F3F3",
+"@+	c #474747",
+"#+	c #86945B",
+"$+	c #D6F38F",
+"%+	c #C6F59F",
+"&+	c #B0FF00",
+"*+	c #D2F393",
+"=+	c #C1F5A3",
+"-+	c #72A743",
+";+	c #B1FF00",
+">+	c #F6F6F6",
+",+	c #86945A",
+"'+	c #CDF397",
+")+	c #72A744",
+"!+	c #B2FF00",
+"~+	c #87A758",
+"{+	c #F5F5F5",
+"]+	c #D5F28E",
+"^+	c #C8F39A",
+"/+	c #B8F6AB",
+"(+	c #B3FF00",
+"_+	c #86A757",
+":+	c #F4F4F4",
+"<+	c #D1F292",
+"[+	c #72A644",
+"}+	c #B4FF00",
+"|+	c #EDEDED",
+"1+	c #4B4F3A",
+"2+	c #6C7653",
+"3+	c #677353",
+"4+	c #667355",
+"5+	c #647256",
+"6+	c #637257",
+"7+	c #637359",
+"8+	c #64775D",
+"9+	c #667B62",
+"0+	c #4D7D1F",
+"a+	c #B5FF00",
+"b+	c #537424",
+"c+	c #797979",
+"d+	c #777777",
+"e+	c #7B7B7B",
+"f+	c #848484",
+"g+	c #7C7C7C",
+"h+	c #3B3B3B",
+"i+	c #427D06",
+"j+	c #B6FF00",
+"k+	c #385808",
+"l+	c #326D01",
+"m+	c #5C9314",
+"n+	c #4C7C00",
+"o+	c #476424",
+"                      . + @ #                   ",
+"                      $ % & *                   ",
+"    = - ; > , ' ) ! ~ { ] ^ / ( _               ",
+"    : < [ } | 1 2 3 4 5 ] 6 7 8 9 0             ",
+"    : < a b c d e f g h i j k l m n o           ",
+"    p q a r s t u v w x y z A B m C D E         ",
+"    p q F r G H I J K L M N O P m Q R S T       ",
+"    U V F r W H X Y Z `  ...+.Q @.#.$.%.&.*.    ",
+"    U V [ b W =.X -.;.>.,...'.).!.~.{.B ].^.    ",
+"    /.(.[ _.G :.X -.;.<.[.}.|.1.).2.3.{.4.5.    ",
+"    /.(.6._.G :.7.-.;.8.[.9.0.D a.b.2.Q c.5.    ",
+"    d.e.f.g.s =.h.i.j.k.l.m.n.o.D a.p.q.r.s.    ",
+"    d.t.f.g.s H 7.i.u.v.w.x.y.z.A.n B.p.C.s.    ",
+"    d.t.D.} E.H 7.i.j.F.G.H.I.J.K.L.M.N.O.P.    ",
+"    d.t.D.} c t X Q.j.R.S.T.y.U.J.V.W.M.8 P.    ",
+"    d.t.D.X.c t X -.Y.Z.`.T. +U.J.V..+++l @+    ",
+"    #+$+D.X.| %+I -.Y.Z.& &+ +K.U.J.V..+a.@+    ",
+"    #+$+*+X.| %+=+Y ;.-+^ ;+ +>+K.U.V..+W.@+    ",
+"    ,+$+*+'+| d =+Y ;.)+6 !+~+{+>+U.J.V.C @+    ",
+"    ,+]+*+'+^+d u J /+)+6 (+_+:+{+K.U.J.L.@+    ",
+"    ,+]+<+'+^+1 u v Z [+j }+_+++{+>+K.U.|+@+    ",
+"    1+2+3+4+5+6+7+8+9+0+z a+b+c+d+e+T f+g+h+    ",
+"                      i+N j+k+                  ",
+"                      l+m+n+o+                  "};
diff --git a/po/bg.gmo b/po/bg.gmo
index fe34876..fa66f2e 100644
--- a/po/bg.gmo
+++ b/po/bg.gmo
diff --git a/po/bg.po b/po/bg.po
index 858c753..e03de07 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag 1.99.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2005-09-09 18:38+0300\n"
 "Last-Translator: Luchezar P. Petkov <>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:122
+#: src/about.c:134
 #, fuzzy
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
@@ -26,191 +26,232 @@ msgstr ""
 "FLAC, Ogg Vorbis, MousePack и Monkey's аудио фалове. Лесният и приетен GTK+ "
 "интерфейс правят поставянето на етикети приятно под GNU/Liux."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(Превод на немски)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(Превод на руски)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(Превод на холандски)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(Превод на шведски)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(Превод на унгарски)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(Превод на италиански)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(Превод на японски)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(Превод на украински)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(Превод на чешки)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(Превод на испански)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(Превод на полски)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(Превод на румънски)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(Превод на датски)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(Превод на гръцки)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Превод на португалски)"
 
-#: src/about.c:159
+#: src/about.c:170
 #, fuzzy
 msgid "(Bulgarian translation)"
 msgstr "(Превод на унгарски)"
 
-#: src/about.c:160
+#: src/about.c:171
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(Превод на японски)"
 
-#: src/about.c:161
+#: src/about.c:172
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(Превод на гръцки)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(Превод на немски)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Коментар"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "Относно..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "Относно"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "Компилиран на: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "Използват се: GTK+ %d.%d.%d и id3lib %d.%d.%d"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "Поддръжката за FLAC файлове е изключена"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "Автор: %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "Поддръжката за FLAC файлове е изключена"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "Електронна поща: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Интернет страница: "
 
-#: src/about.c:292
+#: src/about.c:328
+msgid "Description:"
+msgstr "Описание:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:296
-#, fuzzy, c-format
-msgid "(MP3 file support disabled)"
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
+#, c-format
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "Няма налична памет"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "Поддръжката за Ogg Vorbis файлове е изключена)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:317
+#: src/about.c:450
 #, fuzzy
-msgid "(MP4/AAC file support disabled)"
+msgid "MP4/AAC file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:322
+#: src/about.c:460
 #, fuzzy
-msgid "(WavPack file support disabled)"
+msgid "WavPack file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "Автор: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "Електронна поща: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Интернет страница: "
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "Описание:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "Благодарности"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "Преводачи:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "Програмисти:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "Промени"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -545,7 +586,7 @@ msgstr "Преименува папка"
 msgid "Reload Directory"
 msgstr "Презарежда папка"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "Разглежда папка с ..."
 
@@ -691,7 +732,7 @@ msgstr "Нов път по подразбиране за избраните фа
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Потвърждение..."
 
@@ -704,110 +745,99 @@ msgstr ""
 "Някои файлове бяха променени, но бяха записани...\n"
 "Желаете ли да ги запазите, преди да смените директорията?Грешка..."
 
-#: src/browser.c:827
-#, fuzzy, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-" Избраният път за 'път по подразбиране за файловете' е невалиден!\n"
-"'%s'\n"
-"(%s) "
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-#, fuzzy
-msgid "Error..."
-msgstr "Грешка в размера..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 #, fuzzy
 msgid "<All albums>"
 msgstr "Албуми"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Грешка: Търсене за %s, неможе се намери възел %s в дървото."
 
-#: src/browser.c:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "Изпълнител"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "Албуми"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "Файлове"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Албум"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Едно ниво по-нагоре"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Задайте папка за търсене"
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Изглет като списък"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "Изпълнител и албум"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "Преименува директория"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Преименува папката '%si' на : "
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "Използва маска :"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 #, fuzzy
 msgid "If activated, it will use masks to rename directory."
 msgstr "Ако е активирано, ще се създаде плейлист в предходната директория"
 
-#: src/browser.c:3236
+#: src/browser.c:3263
 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:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "Невалидна маска на скенера"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 #, fuzzy
 msgid "Rename directory preview..."
 msgstr "Преглед на преименувания файл..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+#, fuzzy
+msgid "Error..."
+msgstr "Грешка в размера..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "Трябва да въведете име на папката!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -836,14 +866,14 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
 "(%s)"
 msgstr ""
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -858,52 +888,52 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "Папката преименувана"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Програма за стартиране :"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Въведете програма за стартиране.Тя ще получи текущата директория като "
 "параметър"
 
-#: src/browser.c:3774
+#: src/browser.c:3801
 #, fuzzy
 msgid "Open File with ..."
 msgstr "Отваряне на файл с..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Въведете програма за стартиране.Тя ще получи текущата директория като "
 "параметър"
 
-#: src/browser.c:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "Трябва да въведете име на програма!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, fuzzy, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Неможе да се изпълни %s (%s)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "Неможе да се повдигне друг процес!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Изпълнена команда : %s %s"
@@ -995,7 +1025,7 @@ msgstr "Търсене в:"
 msgid "All Fields"
 msgstr "Всички полета"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Друго"
 
@@ -1071,7 +1101,7 @@ msgstr "Категории"
 msgid "Results :"
 msgstr "Резултати :"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "Търсене :"
 
@@ -1100,7 +1130,7 @@ msgstr ""
 msgid "Invert lines selection"
 msgstr "Завърта селекцията "
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "Избира всички линии"
 
@@ -1122,15 +1152,15 @@ msgstr "Постави посока :"
 msgid "All"
 msgstr "Всичко"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "Име на файл"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "Заглавие"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "Година"
 
@@ -1142,12 +1172,12 @@ msgstr "Песен No."
 msgid "# Tracks"
 msgstr "Песни"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "Жанр"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Изпълни текущият скенер за всеки файл"
 
@@ -1159,7 +1189,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1178,11 +1208,11 @@ msgstr ""
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Зареди избраните линии или всички линии(ако няма избрани такива)"
 
-#: src/cddb.c:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Готов за търсене..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1190,76 +1220,76 @@ msgstr ""
 "Албум: '%s', Изпълнител: '%s', Продължителност: '%s', година: '%s', жанр: '%"
 "s', ID: '%s"
 
-#: src/cddb.c:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Завърта селекцията"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Сортиране по номер на песен"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Сортиране по име на песен"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr ""
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr ""
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr ""
 
 #. Open connection to the server
-#: src/cddb.c:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Свързване към хост '%s' порт '%d' ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Неможе да се свърже с хост '%s' (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Свързан с хост '%s'"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Получаване на информация (%s) ..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Грешка при премахването на ID3v1 етикет на '%s' (%s)\n"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Не може да се създаде или отвори файл '%s' (%s)\n"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Неможе да се зареди файла '%s' (%s)"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "Изпращане на  заявка..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Неможе да се изпрати заявка (%s)!"
@@ -1268,91 +1298,91 @@ msgstr "Неможе да се изпрати заявка (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "Получаване на информация ..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "Сървърът върна грешен отговор! (%s)"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Сървърът върна грешен отговор! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Съжалявам, уеб базираното търсене в момента не работи!"
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Намерени %d съответстващи албума"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Получаване на информация (%s) ..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Получаване на информация (%s) ..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d файлове са избрани!"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Готов за търсене..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Изпращане на  заявка (Cddbld: %s #песни: %d, дължина на диска: %d) ..."
 
-#: src/cddb.c:3231
+#: src/cddb.c:3268
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Намерени %d съответстващи албума"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Неможе да се зареди файла '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "Зареждане на списъка с песните от албума ..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1361,7 +1391,7 @@ msgid ""
 "Do you want to continue ?"
 msgstr ""
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "Запис на етикет от CDDB"
 
@@ -1637,11 +1667,11 @@ msgstr "Връзката към файла не съществува"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Слой ?"
 
@@ -1649,7 +1679,7 @@ msgstr "?, Слой ?"
 msgid "Bitrate:"
 msgstr ""
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1657,17 +1687,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Честота:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Начин:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1847,14 +1877,14 @@ msgid "Tag selected files with these pictures"
 msgstr "Поставя етикет на избраните файлове с тези картинки"
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
-msgstr "Премахва избраните картинки, освен всички."
-
-#: src/easytag.c:1051
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr ""
 "Добавяне на картинки към етикета(провлачване и пускане също е налично)."
 
+#: src/easytag.c:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "Премахва избраните картинки, освен всички."
+
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "Запазва избраните картинки на хард диска."
@@ -2230,7 +2260,7 @@ msgstr "Изтриване на файл"
 msgid "File '%s' deleted"
 msgstr "Файлът '%s' бе изтрит"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2242,109 +2272,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "Търсене в прогрес..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "Файл: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Намерени %d файла в тази директория и поддиректориите."
 
-#: src/easytag.c:3235
+#: src/easytag.c:3239
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "Намерени %d файла в тази директория"
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u файла"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr "Не са намерени файлове в тази директория и поддиректориите!"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "Не са намерени файлове в тази директория"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Търсене..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr " СПИРА търсенето... "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "Изберете папка за претърсване!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "Поставя етикет на избраните файлове с това поле"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Конвертира '_' и '%20' до интервали"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "Ковертира ' ' до '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "Всичко с главни букви"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "Всичко с малки букви"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "Първата буква е главна"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "Първата буква във всички думи е главна"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "Премахва интервали"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Вмъква интервал преди главна буква"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 msgid "Remove duplicate spaces or underscores"
 msgstr "Премахва двоични интервали или подчертани думи"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Неправилно излизане! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, c-format
-msgid "Received signal %s (%d)"
-msgstr "Получен е сигнал %s (%d)"
+msgid "Received signal %s (%d)\a"
+msgstr "Получен е сигнал %s (%d)\a"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2354,11 +2384,12 @@ msgstr ""
 "с gdb backtrace ('gdb easytag core' then 'bt' and 'l') и информация за "
 "възпроизвеждането й до <easytag@gmail.com>"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Неразпознат сигнал"
 
-#: src/easytag.c:4466
+#: src/easytag.c:4479
+#, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2371,17 +2402,16 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Нормално напускане."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 #, fuzzy
 msgid ""
 "Some files have been modified but not saved...\n"
@@ -2390,7 +2420,7 @@ msgstr ""
 "Някои файлове бяха променени, но бяха записани...\n"
 "Желаете ли да ги запазите, преди да смените директорията?Грешка..."
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 #, fuzzy
 msgid " Do you really want to exit the program? "
 msgstr ""
@@ -2492,7 +2522,7 @@ msgstr ""
 "във системната кодова таблица\n"
 "(Опитайте да настроите системната променлива G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "Превод на името на файла"
 
@@ -2653,123 +2683,123 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "Избира файл..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " Добре "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " Да "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " Не "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " Прилагане "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " Запазване "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " Отказване "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " Затваряне "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " Записване "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " Изпълнение "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr " Търсене "
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr " Избор..."
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "Избира директория..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "Избира файл..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 #, fuzzy
 msgid "Warning..."
 msgstr "Търсене..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Неможе да се изпълни %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "Б"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "КБ"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "МБ"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "ГБ"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "ТБ"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "Възпроизвежда се плейлиста"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "M3U име на плейлист"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "Използва име на директория"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Редактира маски"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "Опции на плейлиста"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Влключва само избраните файлове"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 #, fuzzy
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
@@ -2779,53 +2809,53 @@ msgstr ""
 "В противен случай, ще се запишат всички файлове.Използва пълният път за "
 "файловете в плейлиста"
 
-#: src/misc.c:1352
+#: src/misc.c:1397
 #, fuzzy
 msgid "Use full path for files in playlist"
 msgstr "Използва относителен път към файловете в плейлиста"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 msgid "Use relative path for files in playlist"
 msgstr "Използва относителен път към файловете в плейлиста"
 
 #. Create playlist in parent directory
-#: src/misc.c:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "Създава плейлист в предходната директория"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Ако е активирано, ще се създаде плейлист в предходната директория"
 
 #. DOS Separator
-#: src/misc.c:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "Използва DOS разделител за директории"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 "Тази опция заменя UNIX разделителя на директории '/' с DOS разделител'\\'."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "Съдържание на плейлиста"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "Записва само списък с файлове"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "Записва информация използвайки име на файл"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Записва инфрормация използвайки:"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2834,12 +2864,12 @@ msgstr ""
 "Плейлист '%s' вече съществува!\n"
 "Презаписване?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "Записване на плейлист..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2848,102 +2878,137 @@ msgstr ""
 "Неможе да се запише плейлист '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Записан е плейлист '%s'"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "Диск"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "Песен"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Коментар"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "Композитор"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "Ориг. изпълнител"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Права"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "URL"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "Деодирано от"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "Търсене за име на файл"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 "Въведете дума за търсене във файловете, или нищо, за да се покажат всички."
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "В :"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "Тагът"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Чуствителност към регистъра"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Намерени : %d file(s)"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "Зареждане на имената на файлове от TXT файл"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 msgid "File :"
 msgstr "Файл :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " Зареждане "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "Съдържание на заредените файлове :"
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "Потвърждаване за преименуване на файлове"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "Поставя интервал преди главна буква"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Изтриване на тази линия"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "Изтрива празните линии"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "Влключва само избраните файлове"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "Влключва само избраните файлове"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Презареждане"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "Списък с имена на файлове :"
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Записва само списък с файлове"
 
-#: src/misc.c:2828
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Избира всички линии"
+
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2952,21 +3017,23 @@ msgstr ""
 "текущият избран скенер ще бъде задействан (прозорецът на скенера трябва да е "
 "отворен)."
 
-#: src/misc.c:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "Добавяне на празна линия"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "Изтриване на тази линия"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "Изтрива празните линии"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Премества нагоре тази маска"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "Презареждане"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Премества надолу тази маска"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3103,121 +3170,121 @@ msgstr ""
 msgid "Save file..."
 msgstr "Избира файл..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "JPEG изображение"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "PNG картинка"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "Непознат тип картинка"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "32 на 32 пиксела PNG файлова икона"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "Друга файлова икона"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "Обложка (отпред)"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "Обложка (отзад)"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "Брошурка"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "Медия (т.е. етикет върху диска)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr ""
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "Изпълнител/Реализатор"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "Диригент"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "Бенд/Оркестър"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "Писател/Текстописец"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "Място на записване"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "По време на записване"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "По време на изпълнение"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "Снимка от видео клип"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "Изсветлен тип"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "Илюстрация"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "Лого на бенд/Изпълител"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "Лого на издател/студио"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "Непознат тип изображение"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "пиксела"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "Тип"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "Описание"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
 msgstr ""
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr ""
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3229,7 +3296,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "Файлът на изображението не е зареден..."
 
@@ -3485,24 +3552,51 @@ msgstr ""
 "трябвада са съобразени с програмата(като 'xmms -p') преди да получите "
 "файлове с други аргументи."
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Настройки на етикетите"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "В центъра на екрана"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr "Ако е активирано, ще се създаде плейлист в предходната директория"
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 #, fuzzy
 msgid "File Settings"
 msgstr "_Настройки"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "Настройки на файлове"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr "Заменя невалидни символи в името на файла(За Windows и CD-Rom)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3515,40 +3609,40 @@ msgstr ""
 "преименува файл от етикетът чрез скенерът."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "Конвертира файловите разширения на :"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "Малки букви"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "На пример, разширенията ще бъдат конвертирани на 'mp3'"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "Главни букви"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "На пример, разширенията ще бъдат конвертирани на '.MP3'"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "Без промяна"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "Разширението няма да се конвертира"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "Запазва времето на промяна на файла"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
@@ -3556,13 +3650,13 @@ msgstr ""
 "файл."
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3573,48 +3667,48 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 #, fuzzy
 msgid "Character Set for File Name"
 msgstr "Подреждане на знаците за ID3 етикети"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
 msgstr ""
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr ""
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "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 ""
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
 "looking characters."
 msgstr ""
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3623,20 +3717,20 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "Настройки на етикетите"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "Настройки на етикетите"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "Автоматично завършване на датата, ако не е завършено"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3646,22 +3740,22 @@ msgstr ""
 "(на пример, ако текущата година е 2005: 5 => 2005, 4 => 2004, 6 => 1996,95 "
 "=> 1995, ...)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr ""
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
 "'10',...). Else it keeps the 'raw' track value."
 msgstr ""
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Ogg Vorbis файлове: Записва още коментар за XMMS формата"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3675,17 +3769,17 @@ msgstr ""
 "тази опция, ако не искате други програми да имат проблеми с непознато поле."
 "Коментарите няма да бъдат показвани и в XMMS"
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr ""
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr ""
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr ""
 
@@ -3693,23 +3787,23 @@ msgstr ""
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 #, fuzzy
 msgid "ID3 Tag Settings"
 msgstr "Настройки на етикетите"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "Правила за ID3 етикети"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 #, fuzzy
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "Записва ID3 тагове в FLAC файлове с FLAC етикет"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3718,11 +3812,11 @@ msgstr ""
 "(съгласно двете правила по-горе, плюс FLAC етикетът)"
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr ""
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3731,11 +3825,11 @@ msgid ""
 msgstr ""
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Автоматично конвертира стари версии на ID3v2 етикети"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3744,42 +3838,42 @@ msgstr ""
 "ID3v2.3 версии"
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 #, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "Записва ID3v2 етикет"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Подреждане на знаците за ID3 етикети"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Записва ID3v2 етикет"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "Записва ID3v2 етикет"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3789,12 +3883,12 @@ msgstr ""
 "файловете."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 #, fuzzy
 msgid "Version:"
 msgstr "Описание:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3803,56 +3897,56 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 #, fuzzy
 msgid "Unicode "
 msgstr "Уникод  (UTF-8)"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Деодирано от"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 msgid "Character set used to write the tag data in the file."
 msgstr "Кодова таблица използвана за да се запишат данните на етикет във файл"
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 #, fuzzy
 msgid "No"
 msgstr " Не "
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ID3 етикет"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "Записва ID3v1.x етикет"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3860,22 +3954,22 @@ msgstr ""
 "Ако е активирано ID3v1 етикет ще бъде добавен или обновен в края на "
 "MP3файловете."
 
-#: src/prefs.c:846
+#: src/prefs.c:878
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Кодова таблица използвана за да се запишат данните на етикет във файл"
 
 #. Character Set for reading tag
-#: src/prefs.c:878
+#: src/prefs.c:910
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Подреждане на знаците за ID3 етикети"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3892,31 +3986,31 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:914
+#: src/prefs.c:947
 msgid "Character set used to read tag data in the file."
 msgstr "Кодова даблица използвана за да се четат данните за етикета във файл"
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Скенер"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Запълва скенера за етикети - конвертиране на символи"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Конвертира долна черта '_' и низове '%20' до интервал ' '"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Конвертира интервал ' ' до долна черта '_'"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -3925,11 +4019,11 @@ msgstr ""
 "маска заскенера за етикети"
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Преименува файловия скенер - конвертиране на символи"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -3938,17 +4032,17 @@ msgstr ""
 "от скенера за файлове"
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 msgid "Process Fields Scanner - Character Conversion"
 msgstr ""
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1001
+#: src/prefs.c:1034
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1005
+#: src/prefs.c:1038
 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 "
@@ -3957,15 +4051,15 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Прозорец на скенера"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Отваря прозореца на скенера при стартиране"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -3973,11 +4067,11 @@ msgstr ""
 "Активирайте тази опция за да се отваря автоматично прозреца на скенера "
 "когато EasyTAGсе стартира"
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Прозореца на скенера е винаги отгоре"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -3986,16 +4080,16 @@ msgstr ""
 "върхуглавният прозорец"
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "Полета"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Презаписва полетата когато сканира етикет"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4003,11 +4097,11 @@ msgstr ""
 "Ако е активирано, скенерът ще замести съществуващият текст в полетата с нов "
 "Ако е деактивирано, сам празните полета на етикетите ще бъдат запълвани."
 
-#: src/prefs.c:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "Запазва този текст като коментар по подразбиране :"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4016,12 +4110,12 @@ msgstr ""
 "коментар използвайки 'Fill Tag' скенера."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Използва CRC32 като коментар по подразбиране (за файлове само с ID3 етикети)."
 
-#: src/prefs.c:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4032,46 +4126,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "CD база данни"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Автоматично търсене"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "Име :"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "Порт :"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "CGI път :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Настройки на сървъра"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "CD база данни"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 #, fuzzy
 msgid "Path :"
 msgstr "CGI път :"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4080,52 +4174,52 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Настройки на сървъра посредник"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Използва сървър посредник"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Активира настройките на сървъра посредник."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "Име на хост :"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Име на сървъра посредник."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Порт на сървъра посредник."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "Потребителско име :"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "Потребителко име за сървъра посредник."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "Парола :"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr "Парола за сървъра посредник."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "Списък с имена на песни"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4133,7 +4227,7 @@ msgstr ""
 "Избира съответния аудио файл (съобразно позицията или DLM ако са активирани "
 "по-долу)"
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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."
@@ -4142,7 +4236,7 @@ msgstr ""
 "съответният аудио файл в главния списък също ще бъде избран."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4153,15 +4247,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Потвърждаване"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Потвърждаване за напускане на програмата"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4169,53 +4263,57 @@ msgstr ""
 "Ако е активирано, отваря диалогов прозорец за да се поиска потвърждение "
 "преди напускане на програмата."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "Потвърждаване за запис на етикети"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "Потвърждаване за преименуване на файлове"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "Потвърджаване за изтриване на файлове"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "Потвърждаване за писане на плейлисти"
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Прилага промените (но не ги запазва) и затваря този прозорец"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "Затваря този прозорец без запазване"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 msgid "Save changes and close this window"
 msgstr "Запазва промените и затваря прозореца"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Пример : %.*d_-_Име_на_песен_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "Промените са приложени"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "Конфигурацията е запазена"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "Конфигурацията е непроменена"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4226,11 +4324,11 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "Това не е директория"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
@@ -4247,36 +4345,36 @@ msgstr "Преименува файл и директория"
 msgid "Process Fields"
 msgstr "Индикатор на процеси"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "Етикетът е успешно сканиран"
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Етикетът е успешно сканиран...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Грешка при сканиране: неможе да се намери сепаратор '%s'в '%s"
 
-#: src/scan.c:660
+#: src/scan.c:663
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Неможе да конвертира името на файл '%s' в системната кодова таблица."
 
-#: src/scan.c:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "Новото име на файла е успешно сканирано..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Новото име на файла е успешно сканирано...(%s)"
@@ -4284,56 +4382,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "Сканиране за файл и етикет"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Скенер :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "Избира тип на скенер за ползване"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Отваря прозореца на скенера / Сканира избраните файлове"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Опции на скенера"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Показва / скрива редактора на маски"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Показва / скрива легенда"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "Затваря този прозорец"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 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:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "Запълва предварителния преглед на етикета..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr "Задава текущият път като префикс за маската"
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4342,15 +4440,15 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "Преглед на преименувания файл..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Избира файлове:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4359,126 +4457,126 @@ msgstr ""
 "Изберете тези, които ви интересуват."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "Ф"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "Обработва полето за име на файл"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "З"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "Обработва полето за заглавие"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "И"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "Обработва полето за изпълнител"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "А"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Обработва полето за албум"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "Ж"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "Обработва полето за жанр"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "Коме"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "Обработва полето за коментар"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "Комп"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Обработва полето за композитор"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "Ор. Изп."
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 msgid "Process original artist field"
 msgstr "Обработва полето за оригинален изпълнител"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Ав"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Обработва полето за авторско право"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "Обработа полето за URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr ""
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr ""
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Завърта селекцията"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Избира/ Не избира всички."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Конвертира '_' и '%20' до ' '"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Конвертира :"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "до : "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4486,7 +4584,7 @@ msgstr ""
 "Знакът долна черта или низът '%20' са заменени от един интервал. Пример, "
 "преди: 'Текст%20В%20Един_Запис', след: 'Текст В Един Запис'."
 
-#: src/scan.c:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4494,11 +4592,12 @@ msgstr ""
 "Знакът интервал е заменен от долна черта. Пример, преди: 'Текст В Един "
 "Запис', след: 'Текст_В_Един_Запис'."
 
-#: src/scan.c:2171
-msgid "Replace a character by an other one."
-msgstr "Заменя един знак с друг"
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4506,7 +4605,7 @@ msgstr ""
 "Конвертира всички букви във всички полета до главни букви. Пример, преди: "
 "'Текс В ЕДИН запис', след: 'ТЕКСТ В ЕДИН ЗАПИС'."
 
-#: src/scan.c:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4514,7 +4613,7 @@ msgstr ""
 "Конвертира всички букви във всички полета до малки букви. Пример, преди: "
 "'ТЕКСТ В един запис', след: 'текст в един запис'."
 
-#: src/scan.c:2209
+#: src/scan.c:2325
 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'."
@@ -4522,7 +4621,7 @@ msgstr ""
 "Конвертира първата буква във всички полета до главна буква. Пример, преди: "
 "'текст В Един ЗАПИС', след: 'Текст в един запис'."
 
-#: src/scan.c:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4530,15 +4629,15 @@ msgstr ""
 "Конвертира всяка първа буква до главна във всички полета. Пример, преди: "
 "'Текст в един ЗАПИС', след: 'Текст В Един Запис'."
 
-#: src/scan.c:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Поставя интервал преди главна буква"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "Премахва дублиращи се интервали или главни букви"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4546,7 +4645,7 @@ msgstr ""
 "Всички интервали преди буквите се премахват. Пример, преди: 'Текст В Един "
 "Запис', след: 'ТекстВЕдинЗапис'."
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4554,7 +4653,7 @@ msgstr ""
 "Поставя интервал преди всяка главна буква. Пример, преди: 'ТекстВЕдинЗапис', "
 "след: 'Текст В Един Запис'."
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4565,185 +4664,185 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "Легенда"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : изпълнител"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : албум"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : коментар"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p : композитор"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r : авторски права"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : номер на диск"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : кодирано от"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : жанр"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : игнорирано"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : номера на песни"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : ориг. изпълнител"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : песен"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : заглавие"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : година"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Редактор на маски"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "Създава нова маска"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Премества нагоре тази маска"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Премества надолу тази маска"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Дублира маска"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Добавя маски по подразбиране"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "Премахва маска"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Запазва маска"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "Нова_маска"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "Копиране: няма избран ред!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "Премахване: няма избран ред!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Преместване нагоре: няма избран ред"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Преместване надолу: няма избран ред!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "ГРЕШКА: Не може да запиша конфигурационен файл: %s (%s)\n"
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Не може да отвори конфигурационен файл '%s' (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "Зарежда конфигурация по подразбиране..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Не може да се създаде или отвори файл '%s' (%s)"
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "ГРЕШКА: Не може да запиша конфигурационен файл: %s (%s)\n"
 
 #. Fall back to defaults
-#: src/setting.c:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Зарежда настройки по подразбиране 'Запълва маската на етикет'..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "Зарежда настройки по подразбиране 'Преименува маска на файл'..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 #, fuzzy
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Зарежда настройки по подразбиране 'Преименува маска на файл'..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ГРЕШКА: Променливата на обкръжението HOME не е дефинирана!\n"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ГРЕШКА: Не може да създаде директория '%s' (%s)!"
@@ -4827,6 +4926,37 @@ msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ " Избраният път за 'път по подразбиране за файловете' е невалиден!\n"
+#~ "'%s'\n"
+#~ "(%s) "
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Чуствителност към регистъра"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Заменя един знак с друг"
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Съдържание на заредените файлове :"
+
+#~ msgid "Files Name List :"
+#~ msgstr "Списък с имена на файлове :"
+
+#, fuzzy
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "Поддръжката за FLAC файлове е изключена"
+
+#, fuzzy
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "Поддръжката за FLAC файлове е изключена"
+
+#, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "Невалидна версия на етикет"
 
diff --git a/po/cs.gmo b/po/cs.gmo
index 3b4a4c9..020d990 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index c98c25f..34e87ed 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,14 +1,14 @@
 # Czech translation for EasyTAG
 # Copyright (C) 2002-2007 Free Software Foundation, Inc.
 # Milan Siebenburger <milan.siebenburger@ais.cz>, 2002, 2003, 2004.
-# Zbynek Mrkvicka <zbynek@oachot.cz>, 2005, 2006, 2007
+# Zbynek Mrkvicka <zbynek@mrkvicka.eu>, 2005, 2006, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: EasyTAG 2.1\n"
+"Project-Id-Version: EasyTAG 2.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
-"PO-Revision-Date: 2007-05-09 20:58+0100\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
+"PO-Revision-Date: 2007-09-29 14:05+0100\n"
 "Last-Translator: Zbynek Mrkvicka <zbynek@mrkvicka.eu>\n"
 "Language-Team: Czech <zbynek@mrkvicka.eu>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
@@ -27,188 +27,229 @@ msgstr ""
 "Vorbis, MP4/AAC, MusePack a Monkey Audio souborech. S jednoduchým a pěkným "
 "GTK+ rozhraním je tagování v GNU/Linuxu mnohem jednodušší."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(Německý překlad)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(Ruský překlad)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(Holandský překlad)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(Švédský překlad)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(Maďarský překlad)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(Italský překlad)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(Japonský překlad)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(Ukrajinský překlad)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(Český překlad)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(Španělský překlad)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(Polský překlad)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(Rumunský překlad)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(Dánský překlad)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(Řecký překlad)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Brazilský překlad)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(Bulharský překlad)"
 
-#: src/about.c:160
+#: src/about.c:171
 msgid "(Chinese translation)"
 msgstr "(Čínský překlad)"
 
-#: src/about.c:161
-#, fuzzy
+#: src/about.c:172
 msgid "(Hebrew translation)"
-msgstr "(Řecký překlad)"
+msgstr "Hebrejský překlad:"
+
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(Německý překlad)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Poznámka"
 
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "O aplikaci..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "O aplikaci"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(kompilováno: %s)"
 
-#: src/about.c:276
-#, fuzzy, c-format
+#: src/about.c:297
+#, c-format
 msgid "(using: GTK+ %d.%d.%d)"
-msgstr "(používá: GTK+ %d.%d.%d a id3lib %d.%d.%d)"
+msgstr "(používá: GTK+ %d.%d.%d)"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(podpora MP3 vypnuta)"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "Autor: %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(podpora MP3 vypnuta)"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "E-mail: %s"
 
-#: src/about.c:292
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Webová stránka: "
+
+#: src/about.c:328
+msgid "Description:"
+msgstr "Popis:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "(podpora MP3 vypnuta)"
 
-#: src/about.c:296
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
 #, c-format
-msgid "(MP3 file support disabled)"
-msgstr "(podpora MP3 vypnuta)"
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
+msgstr "(podpora ID3v2.3 tagů vypnuta)"
+
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "Není dostupná žádná pamět"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(podpora Ogg Vorbis formátu vypnuta)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
-msgstr "(podpora MP3 vypnuta)"
+msgid "Speex file support"
+msgstr "(podpora Speex formátu vypnuta)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(podpora FLAC formátu vypnuta)"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
 msgstr "(podpora MP4/AAC vypnuta)"
 
-#: src/about.c:322
+#: src/about.c:460
 #, fuzzy
-msgid "(WavPack file support disabled)"
-msgstr "(podpora MP3 vypnuta)"
-
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "Autor: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-mail: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Webová stránka: "
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "Popis:"
+msgid "WavPack file support"
+msgstr "(podpora WavPack formátu vypnuta)"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "Poděkování"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "Překlady:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "Obecné:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "Změny"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -541,7 +582,7 @@ msgstr "Přejmenovat adresář..."
 msgid "Reload Directory"
 msgstr "Obnovit adresář"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "Procházet adresář s ..."
 
@@ -686,7 +727,7 @@ msgstr "Vybrána nová výchozí cesta k souborům"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Potvrzení..."
 
@@ -698,86 +739,65 @@ 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:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"Zadaná cesta je neplatná!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "Chyba..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 msgid "<All albums>"
 msgstr "<Všechna alba>"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, 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:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "Umělec"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# Alba"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# Soubory"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Přejít do nadřazeného adresáře"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Napište název adresáře."
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Strom"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "Umělec & Album"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "Přejmenovat adresář"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Přejmenovat adresář '%s' na : "
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "Použít masku :"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 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:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -785,21 +805,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:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "Chybná maska skeneru"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "Náhled přejmenování adresáře..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Chyba..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "Musíte vyplnit název adresáře!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, 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."
@@ -826,7 +856,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:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -835,7 +865,7 @@ msgstr ""
 "Nelze přejmenovat, protože adresář s tímto názvem již existuje!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -850,51 +880,51 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "Adresář přejmenován"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Spustit program :"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 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:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "Otevřít soubor s ..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 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:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "Musíte vyplnit název programu!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Nemohu nalézt program '%s'!"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Nemohu spustit %s (chyba %d)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "Nelze vytvořit proces!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Spuštěný příkaz : '%s %s'"
@@ -982,7 +1012,7 @@ msgstr "Hledat v :"
 msgid "All Fields"
 msgstr "Všechna pole"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Další"
 
@@ -1057,7 +1087,7 @@ msgstr " Kategorie"
 msgid "Results :"
 msgstr "Výsledky :"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "Hledat :"
 
@@ -1086,7 +1116,7 @@ msgstr "Odznačit všechny řádky"
 msgid "Invert lines selection"
 msgstr "Invertovat výběr řádků"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "Označit všechny řádky"
 
@@ -1110,15 +1140,15 @@ msgstr "Nastavit do :"
 msgid "All"
 msgstr "Vše"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "Název souboru"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "Název"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "Rok"
 
@@ -1130,12 +1160,12 @@ msgstr "Pořadí #"
 msgid "# Tracks"
 msgstr "# skladeb"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "Žánr"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Spustí aktuální skener pro každý soubor"
 
@@ -1147,7 +1177,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1162,87 +1192,87 @@ msgstr ""
 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:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Připraveno k vyhledání..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, 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:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Invertovat výběr"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Setřídit podle pořadí skladby"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Setřídit podle názvu skladby"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Hledám server '%s' ..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Nemohu nalézt server '%s' (%s)!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, 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:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Probíhá připojování k '%s', port '%d' ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Nelze se připojit k '%s' (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Připojeno k '%s'"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Přijímám data (%s) ..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Chyba při načítán odpovědi cddb (%s)!"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Nelze vytvořit soubor '%s' (%s)"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Nelze otevřít soubor '%s' (%s)"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "Odesílání požadavku"
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Nelze odeslat požadavek (%s)!"
@@ -1251,62 +1281,62 @@ msgstr "Nelze odeslat požadavek (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "Přijímám data ..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 msgid "The server returned a wrong answer!"
 msgstr "Server vrátil špatnou odpověď!"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Server vrátil špatnou odpověď! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Webové vyhledávání právě není v provozu."
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Nalezeno %d odpovídajících alb"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Přijímám data %d ..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Přijímám data %d ..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr "Další výsledky k načtení ..."
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
-msgstr ""
+msgstr "Bylo vyráno více než 99 souborů! Nelze zaslat požadavek!"
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "Vybráno %d souborů!"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 msgid "Local CD search..."
 msgstr "Lokální vyhledávání CD..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
@@ -1315,27 +1345,27 @@ msgstr ""
 "Vyplňte jí v okně nastavení."
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, 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:3231
+#: src/cddb.c:3268
 #, 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:3327
+#: src/cddb.c:3364
 #, 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:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "Načítání skladeb z alba ..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1348,7 +1378,7 @@ msgstr ""
 "\n"
 "Chcete pokračovat?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "Zapsat tag z CDDB..."
 
@@ -1561,9 +1591,9 @@ msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "Spouštím EasyTAG %s (PId: %d) ..."
 
 #: src/easytag.c:179
-#, fuzzy, c-format
+#, c-format
 msgid "Currently using libid3tag version %s ..."
-msgstr "Používám id3lib ve verzi %d.%d.%d ..."
+msgstr "Používám libid3tag ve verzi %s ..."
 
 #: src/easytag.c:182
 #, c-format
@@ -1622,11 +1652,11 @@ msgstr "Vadný link na soubor"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Vrstva ?"
 
@@ -1634,7 +1664,7 @@ msgstr "?, Vrstva ?"
 msgid "Bitrate:"
 msgstr "Datový tok:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1642,17 +1672,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Vzorkování:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mód:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1834,13 +1864,13 @@ msgid "Tag selected files with these pictures"
 msgstr "Nastavit vybraným souborům tyto obrázky"
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
-msgstr "Odstranit vybrané obrázky, jinak všechny obrázky."
-
-#: src/easytag.c:1051
 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:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "Odstranit vybrané obrázky, jinak všechny obrázky."
+
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "Uložit vybrané obrázky na pevný disk."
@@ -2212,7 +2242,7 @@ msgstr "Vymazání souboru..."
 msgid "File '%s' deleted"
 msgstr "Soubor '%s' byl vymazán"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2224,109 +2254,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "Probíhá hledání..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "Soubor: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, 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:3235
+#: src/easytag.c:3239
 #, 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:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u souborů"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 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:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "Nebyl nalezen žádný soubor v tomto adresáři!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Hledání..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "  PŘERUŠIT vyhledávání...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "Vyberte adresář, který se bude procházet!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "Nastavit vybraným souborům tento název"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Konvertovat '_' a '%20' na mezery"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "Konvertovat ' ' na '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "Všechno velkými písmeny"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "Všechno malými písmeny"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "První písmeno velké"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "První písmeno každého slova velké"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "Smazat mezery"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Vložit mezeru před velká písmena"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 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:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Nestandardní ukončení! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, c-format
-msgid "Received signal %s (%d)"
-msgstr "Zachycen signál %s (%d)"
+msgid "Received signal %s (%d)\a"
+msgstr "Zachycen signál %s (%d)\a"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2336,11 +2366,12 @@ msgstr ""
 "gdb výpisem zásobníku ('gdb easytag core' potom 'bt' a 'l') na adresu "
 "<easytag@gmail.com>"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Neznámy signál"
 
-#: src/easytag.c:4466
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2353,8 +2384,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2373,11 +2403,11 @@ msgstr ""
 "., ./             Načte aktuální adresář.\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Standardní ukončení"
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2385,7 +2415,7 @@ 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:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr " Opravdu chcete ukončit program? "
 
@@ -2426,9 +2456,8 @@ msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis soubor"
 
 #: src/et_core.c:2573
-#, fuzzy
 msgid "Speex File"
-msgstr "Další soubor"
+msgstr "Soubor Speex"
 
 #: src/et_core.c:2579
 msgid "FLAC File"
@@ -2451,9 +2480,9 @@ msgid "Wavpack File"
 msgstr "Wavpack soubor"
 
 #: src/et_core.c:2873
-#, fuzzy, c-format
+#, c-format
 msgid "Pictures (%d)"
-msgstr "Obrázky"
+msgstr "Obrázky (%d)"
 
 #. Bitrate
 #: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
@@ -2482,7 +2511,7 @@ msgstr ""
 "do systémového kódování\n"
 "(Zkuste nastavit proměnnou prostředí G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "Překlad názvu souboru"
 
@@ -2511,9 +2540,9 @@ msgid "Channels:"
 msgstr "Channels:"
 
 #: src/flac_tag.c:140 src/flac_tag.c:741
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
-msgstr "CHYBA při otevírání souboru: '%s' jako FLAC (%s)."
+msgstr "CHYBA při otevírání souboru: '%s' jako FLAC (%s)."
 
 #: src/flac_tag.c:983 src/ogg_tag.c:752
 #, c-format
@@ -2643,122 +2672,122 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "Poškozený soubor..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr "Log"
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " OK "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " Ano "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " Ne "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " Použít "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " Uložit "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " Zrušit "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " Zavřít "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " Zapsat "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " Spustit "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr "Hledání..."
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr " Procházet... "
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "Vybrat adresář..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "Vybrat soubor..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "Warning..."
 msgstr "Varování..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr "Nebyl nastaven audio přerávač!"
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, 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:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "Vygenerovat seznam skladeb"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "Název seznamu M3U"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "Použít název adresáře"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Upravit masku"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "Možnosti seznamu skladeb"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Zahrnout pouze vybrané soubory"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2766,30 +2795,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:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "Použít celou cestu k souborům v seznamu"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 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:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "Vytvořit seznam skladeb v nadřazeném adresáři"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 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:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "Používat DOSovský oddělovač adresářů"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2797,23 +2826,23 @@ msgstr ""
 "Tato volba nahrazuje UNIXovský oddělovač adresářů '/' na DOSovský oddělovač "
 "'\\'."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "Obsah seznamu skladeb"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "Zapsat jen seznam souborů"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "Zapsat informace za použití názvu souboru"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Zapsat informace za použití:"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2822,12 +2851,12 @@ msgstr ""
 "Soubor seznamu skladeb '%s' již existuje!\n"
 "Přepsat?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "Zapsat seznam skladeb..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2836,48 +2865,44 @@ msgstr ""
 "Nelze zapsat do souboru seznamu skladeb '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Zapsán soubor seznamu skladeb '%s'"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "Pořadí"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Poznámka"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "Skladatel"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "Původní umělec:"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "URL"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "Enkódováno"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "Najít soubor"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2885,54 +2910,93 @@ msgstr ""
 "všech souborů."
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "V :"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "Tag"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Rozlišovat velikost písmen"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Nalezeno %d souborů"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "Nahrát názvy souborů z TXT souboru."
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 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:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " Nahrát "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "Načten obsah souboru :"
+#: src/misc.c:2810
+#, 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:2831 src/misc.c:2925
+#, 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:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Vymazat tento řádek"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+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:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "Zahrnout pouze vybrané soubory"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "Seznam souborů :"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "Zahrnout pouze vybrané soubory"
 
-#: src/misc.c:2828
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Obnovit"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Zapsat jen seznam souborů"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Označit všechny řádky"
+
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2940,21 +3004,23 @@ 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:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "Vložit prázdný řádek"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "Vymazat tento řádek"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "Vymazat všechny prázdné řádky"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Posunout masku nahoru"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "Obnovit"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Posunout masku dolů"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3093,113 +3159,113 @@ msgstr ""
 msgid "Save file..."
 msgstr "Uložit soubor..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "JPEG obrázek"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "PNG obrázek"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "Neznámý obrázek"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 px PNG ikona souboru"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "Jiná ikona souboru"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "Přebal (přední)"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "Přebal (zadní)"
 
-#: src/picture.c:808
+#: src/picture.c:809
 #, fuzzy
 msgid "Leaflet page"
 msgstr "webová stránka"
 
-#: src/picture.c:810
+#: src/picture.c:811
 #, fuzzy
 msgid "Media (e.g. label side of CD)"
 msgstr "Velikost etikety (CD/DVD)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "Hlavní umělec/hlavní účinkující/sólista"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "Umělec/Účinkující"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "Skupina/Orchestr"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "Textař"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "Místo nahrávání"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "Během nahrávání"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "Během představení"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "Zachytávání filmu/videa"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "Pestrobarevná ryba"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "Ilustrace"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "Logo skupiny/umělce"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "Logo vydavatele/studia"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "Neznámý typ obrázku"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "pixely"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "Typ"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "Popis"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3207,11 +3273,11 @@ msgstr ""
 "Nemohu zobrazit obrázek, protože nebyl načten dostatek dat k vytvoření "
 "bufferu."
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "Nahrávám obrázek..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3222,7 +3288,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "Soubor s obrázkem nebyl načten..."
 
@@ -3238,9 +3304,8 @@ msgstr "Prohlížeč souborů"
 
 #. Label
 #: src/prefs.c:167
-#, fuzzy
 msgid "Default directory :"
-msgstr "Přejít do výchozího adresáře"
+msgstr "Výchozí adresář"
 
 #: src/prefs.c:179
 msgid ""
@@ -3254,7 +3319,7 @@ msgstr ""
 #: src/prefs.c:200
 msgid ""
 "Load on startup the default directory or the directory passed as argument"
-msgstr ""
+msgstr "Při spuštění nahrát adresář, který byl předán argumentem"
 
 #: src/prefs.c:203
 #, fuzzy
@@ -3278,7 +3343,6 @@ msgstr "Prohledávat podadresáře při čtení adresáře ve stromu."
 
 #. Open the node to show subdirectories
 #: src/prefs.c:215
-#, fuzzy
 msgid "Show subdirectories when selecting a directory"
 msgstr "Zobrazit podadresáře, když je vybrán adresář"
 
@@ -3474,23 +3538,51 @@ msgstr ""
 "Napište název programu, který používáte na přehrávání souborů. Některé "
 "programy potřebují vložit i další parametry (např 'xmms -p')."
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Možnosti tagování"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "střed hlavního okna"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr ""
+"Pokud je aktivováno, bude se seznam skladeb vytvářet v nadřazeném adresáři."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "Nastavení souborů"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "Možnosti souboru"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr "Nahradit neplatné znaky v názvu souborů (pro Windows a CD-Rom)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3503,53 +3595,55 @@ msgstr ""
 "přejmenovávání soubory z tagu skenerem."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "Konvertovat připonu souborů na :"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "malá písmena"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "Přípona bude převedena na '.mp3'"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "všechno velkými písmeny"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "Přípona bude převedena na '.MP3'"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "beze změn"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "Přípona nebude převedena"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "Zachovat čas modifikace souboru"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
 "Zachovat čas modifikace (ve vlastnostech souboru) při ukládání souboru."
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
+"Upravit čas modifikace nadřazeného adresáře souboru (doporučeno při "
+"používání Amarok)"
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3560,12 +3654,12 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr "Znaková sada pro název souboru"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
@@ -3573,11 +3667,11 @@ msgstr ""
 "Pravidla pro případ, že nebude možné konvertovat některé znaky při zápisu "
 "názvu souboru:"
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "Vyzkoušet jinou znakovou sadu"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
@@ -3587,12 +3681,12 @@ msgstr ""
 "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:519
+#: 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:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3601,13 +3695,13 @@ 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:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr "Vynutit systémovou znakovou sadu a zahazovat některé znaky"
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3617,20 +3711,20 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "Nastavení tagů"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "Možnosti tagování"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "Automatické doplnění data, pokud není kompletní"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3639,11 +3733,11 @@ msgstr ""
 "Zkusí doplnit rok, pokud vložíte jen poslední čísla data (např, pokud "
 "současný rok je 2005: 5 => 2005, 4 => 2004, 6 => 1996, 95 => 1995, ...)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "Zapisovat pole pořadí skladby na zadanou délku :"
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3653,11 +3747,11 @@ msgstr ""
 "délku 'n' znaků (Např. pro dva znaky : '05', '09', '10'). Jinak ponechává "
 "původní hodnotu."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Soubory Ogg Vorbis : Zapsat komentář ve formátu XMMS"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3671,17 +3765,17 @@ msgstr ""
 "nechcete aby jiné aplikace hlásily 'neznámé pole'. Ale pak nebude komentář "
 "vidět ani v XMMS."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr "Zaměření pole při přepínání mezi soubory klávesami Page Up/Page Down:"
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr "Ponechat fokus ve stejném poli"
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr "Vrátit fokus do prvního pole (Název)"
 
@@ -3689,22 +3783,21 @@ msgstr "Vrátit fokus do prvního pole (Název)"
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "Nastavení ID3 tagu"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "Pravidla pro ID3 Tagy"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
-#, fuzzy
+#: src/prefs.c:682
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "Zapsat ID3 tagy ve FLAC souborech s FLAC tagem"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3713,11 +3806,11 @@ msgstr ""
 "předchozích pravidel, plus FLAC tag). Jinak budou ID3 tagy odstraněny."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "Odstranit tag, pokud jsou všechna pole prázdná"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3729,11 +3822,11 @@ msgstr ""
 "tato volba vymazat celý tag, pokud je těchto sedm standardních polí prázdných"
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Automaticky konvertovat staré ID3v2 verze tagů"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3741,43 +3834,39 @@ msgstr ""
 "Pokud je zapnuto, staré ID3v2 tagy (ID3v2.2) budou upraveny na ID3v2.3 verzi."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
-msgstr ""
+msgstr "Používat CRC32"
 
-#: src/prefs.c:677
-#, fuzzy
+#: src/prefs.c:709
 msgid "Set CRC32 in the ID3v2 tags"
-msgstr "Zapisovat ID3v2 tag"
+msgstr "Zapisovat CRC32 do ID3v2 tagů"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
-msgstr ""
+msgstr "Použít kompresi"
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
-msgstr ""
+msgstr "Nastavit kompresi ID3v2 tagů"
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
-#, fuzzy
+#: src/prefs.c:718
 msgid "Character Set for writing ID3 tags"
 msgstr "Znaková sada pro ID3 tagy"
 
 #. ID3v2 tags
-#: src/prefs.c:693
-#, fuzzy
+#: src/prefs.c:725
 msgid "ID3v2 tags"
-msgstr "Zapisovat ID3v2 tag"
+msgstr "ID3v2 tagy"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "Zapisovat ID3v2 tag"
 
-#: src/prefs.c:709
-#, fuzzy
+#: src/prefs.c:741
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -3786,12 +3875,11 @@ msgstr ""
 "ID3v2 tag. V opačném případě bude odstraněn."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
-#, fuzzy
+#: src/prefs.c:748
 msgid "Version:"
-msgstr "Popis:"
+msgstr "Verze:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3800,56 +3888,52 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
-msgstr ""
+msgstr "Znaková sada:"
 
 #. Unicode
-#: src/prefs.c:745
-#, fuzzy
+#: src/prefs.c:777
 msgid "Unicode "
-msgstr "Unicode (UTF-8)"
+msgstr "Unicode "
 
-#: src/prefs.c:753
-#, fuzzy
+#: src/prefs.c:785
 msgid "Unicode type to use"
-msgstr "Enkódováno"
+msgstr "Použít typ Unicode"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 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:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
-msgstr ""
+msgstr "Další nastavení pro iconv():"
 
-#: src/prefs.c:790 src/prefs.c:856
-#, fuzzy
+#: src/prefs.c:822 src/prefs.c:888
 msgid "No"
-msgstr " Ne "
+msgstr "Ne"
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
-msgstr ""
+msgstr "//TRANSLIT"
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
-msgstr ""
+msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:812
-#, fuzzy
+#: src/prefs.c:844
 msgid "ID3v1 tags"
-msgstr "ID3 Tag"
+msgstr "ID3v1 tagy"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "Zapisovat ID3v1.x tag"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3857,22 +3941,20 @@ 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:846
-#, fuzzy
+#: src/prefs.c:878
 msgid "Character set used to write ID3v1 tag data in the file."
-msgstr "Znaková sada použitá pro zápis dat tagu do souboru."
+msgstr "Znaková sada pro zápis ID3v1 tagů do souboru."
 
 #. Character Set for reading tag
-#: src/prefs.c:878
-#, fuzzy
+#: src/prefs.c:910
 msgid "Character Set for reading ID3 tags"
-msgstr "Znaková sada pro ID3 tagy"
+msgstr "Znaková sada pro čtení ID3 tagů"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
-msgstr ""
+msgstr "Nestandardní:"
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3889,31 +3971,31 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:914
+#: src/prefs.c:947
 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:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Skener"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Vyplnění tagu - Konverze znaků"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Konvertovat podtržítko '_' a řetězec '%20' na mezeru ' '"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Konvertovat mezeru ' ' na podržítko '_'"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -3921,11 +4003,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:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Přejmenování souboru - Konverze znaků"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -3934,17 +4016,17 @@ msgstr ""
 "konverze."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 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:1001
+#: src/prefs.c:1034
 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:1005
+#: src/prefs.c:1038
 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 "
@@ -3955,26 +4037,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:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Okno skeneru"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Otevřít okno skeneru při startu"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 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:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Okno skeneru bude vždy navrchu"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -3982,16 +4064,16 @@ msgstr ""
 "Pokud je zapnuto, okno s maskami zůstane vždy nad hlavním oknem programu."
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "Pole"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Přepsat pole při skenování tagu"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -3999,11 +4081,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:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "Nastavit tento text jako výchozí poznámku:"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4012,11 +4094,11 @@ msgstr ""
 "do pole poznámky při použití možnosti 'Naplň tag'."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 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:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4027,42 +4109,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "CD databáze"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 msgid "Server Settings for Automatic Search"
 msgstr "Nastavení serveru pro automatické hledání"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "Název :"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "CGI Cesta :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 msgid "Server Settings for Manual Search"
 msgstr "Nastavení serveru pro manuální hledání"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 msgid "Local CD Data Base"
 msgstr "Lokální CD databáze"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 msgid "Path :"
 msgstr "Cesta :"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4074,59 +4156,59 @@ msgstr ""
 "'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' a 'misc'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Nastavení proxy"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Použít proxy"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Pro připojení k serveru používat proxy."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "Server :"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Název proxy serveru."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Port proxy serveru."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "Login :"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "Jméno uživatele pro proxy serveru."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "Heslo :"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr "Heslo uživatele pro proxy server."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "Seznam názvů skladeb"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 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:1320
+#: src/prefs.c:1353
 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."
@@ -4135,7 +4217,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:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4146,15 +4228,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Potvrzování"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Potvrdit opuštění programu"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4162,53 +4244,57 @@ msgstr ""
 "Pokud je zapnuto, otevře se dialogové okno s potvrzením při zavírání "
 "programu."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "Potvrdit zápis tagu do souboru"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "Potvrdit přejmenování souboru"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "Potvrdit smazání souboru"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "Potvrdit zápis seznamu skladeb."
 
-#: src/prefs.c:1389
+#. 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:1422
 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:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "Zavře toto okno bez uložení"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 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:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Příklad : %.*d_-_Nazev_stopy_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "Změny byly použity"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "Konfigurace uložena"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "Konfigurace nebyla změněna"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4219,11 +4305,11 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "Není adresář"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Nemohu nalézt audio přehrávač '%s'!"
@@ -4240,36 +4326,36 @@ msgstr "Přejmenovat soubor a adresář"
 msgid "Process Fields"
 msgstr "Upravit"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "Tag byl úspěšně naskenován..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Tag byl úspěšně naskenován...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, 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:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, 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:660
+#: src/scan.c:663
 #, 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:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "Nový název souboru byl úspěšně naskenován..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nový název souboru byl úspěšně naskenován...(%s)"
@@ -4277,41 +4363,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "Skenování tagu a názvu souboru"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Skener :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "Vyberte druh skenování"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Otevřít okno skeneru / Naskenovat označené soubory"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Možnosti skenování"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Zobrazit / Skrýt editor masky"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Zobrazit / Skrýt legendu"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "Zavřít toto okno"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4320,15 +4406,15 @@ msgstr ""
 "budou plnit pole tagu z názvu souboru a cesty."
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "Náhled tagu..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4341,15 +4427,15 @@ msgstr ""
 "absolutní cestu, jinak je cesta relativní."
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "Náhled nového názvu souboru..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Vyberte pole:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4358,126 +4444,126 @@ msgstr ""
 "které chcete upravit."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "S"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "Upravit pole názvu souboru"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "N"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "Upravit název skladby"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Au"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "Upravit autora"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Upravit album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "Upravit pole žánru"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "P"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "Upravit poznámku"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "S"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Upravit pole skladatele"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "P"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 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:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Upravit pole copyrightu"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "Upravit pole URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "Upravit pole názvu enkodéru"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Invertovat výběr"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Označit/Odznačit vše."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Konvertovat '_' a '%20' na mezery"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Konvertovat :"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "na : "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4485,7 +4571,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:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4493,11 +4579,12 @@ 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:2171
-msgid "Replace a character by an other one."
-msgstr "Nahradí znak jiným znakem."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4505,7 +4592,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:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4513,7 +4600,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:2209
+#: src/scan.c:2325
 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'."
@@ -4521,7 +4608,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:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4529,15 +4616,15 @@ 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:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Vkládat mezeru před velká písmena"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "Odstranit dvojité mezery nebo podtržítka"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4545,7 +4632,7 @@ msgstr ""
 "Mezery mezi slovy budou odstraňovány. Příklad, před: 'Text In An Entry', po: "
 "'TextInAnEntry'."
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4553,7 +4640,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:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4564,183 +4651,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : autor"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : poznámka"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p : skladatel"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r : copyright"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : číslo disku"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : enkódoval"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : žánr"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorováno"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : počet skladeb"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : pův. umělec"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : pořadí"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : název"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : rok"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Editor masky"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "Vytvořit novou masku"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Posunout masku nahoru"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Posunout masku dolů"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Duplikovat masku"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Přidat základní masky"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "Odebrat masku"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Uložit masky"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "Nová_maska"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "Kopírování: Nebyl vybrán žádný řádek!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "Odebrání: Nebyl vybrán žádný řádek!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Posun nahoru: Nebyl vybrán žádný řádek!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Posun dolů: Nebyl vybrán žádný řádek!"
 
-#: src/setting.c:875
-#, fuzzy, c-format
+#: src/setting.c:889
+#, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
-msgstr "CHYBA: Nemohu zapsat konfigurační soubor: %s (%s)"
+msgstr "CHYBA: Nemohu zapsat konfigurační soubor: %s (%s)"
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Nelze načíst konfigurační soubor '%s' (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "Načítá se výchozí konfigurace..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Nelze vytvořit nebo otevřít soubor '%s' (%s)"
 
-#: src/setting.c:1264
-#, fuzzy, c-format
+#: src/setting.c:1278
+#, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
-msgstr "CHYBA: Nemohu zapsat seznam do souboru: %s (%s)"
+msgstr "CHYBA: Nemohu zapsat seznam do souboru: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Načítám výchozí masky pro vyplnění tagů..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 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:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Načítám výchozí masky pro přejmenování adresářů..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "CHYBA: Proměnná prostředí HOME není definována!"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "CHYBA: Nelze vytvořit adresář '%s' (%s)!"
@@ -4762,9 +4849,8 @@ msgid "Error reading initial header packet."
 msgstr "Chyba při čtení počáteční hlavičky paketu."
 
 #: src/vcedit.c:341
-#, fuzzy
 msgid "Ogg bitstream contains neither speex or vorbis data."
-msgstr "Ogg bitstream neobsahuje vorbis data."
+msgstr "Ogg bitstream neobsahuje vorbis ani speex data."
 
 #: src/vcedit.c:375
 msgid "Corrupt secondary header."
@@ -4826,134 +4912,26 @@ msgstr "Audio přehrávač: '%s'"
 msgid "EasyTAG settings dir: '%s'"
 msgstr "Adresář s nastavením EasyTag: '%s'"
 
-#, fuzzy
-#~ msgid "ID3V2 tag Version"
-#~ msgstr "Chybná verze tagu"
-
-#~ msgid "Unicode (UTF-7)"
-#~ msgstr "Unicode (UTF-7)"
-
-#~ msgid "Unicode (UTF-16BE)"
-#~ msgstr "Unicode (UTF-16BE)"
-
-#~ msgid "Unicode (UTF-16LE)"
-#~ msgstr "Unicode (UTF-16BE)"
-
-#~ msgid "Use padding"
-#~ msgstr "Použít padding"
-
-#~ msgid ""
-#~ "Set padding in the ID3v2 tags for faster writing during next changes in "
-#~ "the tag."
-#~ msgstr ""
-#~ "Nastavit padding v ID3v2 tagu pro rychlejší zápis v případě dalších změn "
-#~ "v tagu."
-
-#~ msgid "Always save tags to ISO-8859-1 character set"
-#~ msgstr "Vždy ukládat tagy ve znakové sadě ISO-8859-1"
-
-#~ msgid ""
-#~ "Use the ISO-8859-1 character set (single byte character set) to write the "
-#~ "tag. This character set can be used for the ID3v2 and the ID3v1 tags, but "
-#~ "note that non-ISO-8859-1 characters will be lost.\n"
-#~ "\n"
-#~ "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.\n"
-#~ "Also some rules can be defined if some characters can't be converted."
-#~ msgstr ""
-#~ "K zápisu tagu použít znakovou sadu ISO-8859-1. Tato znaková sada může být "
-#~ "použita pro ID3v2 a ID3v1 tagy, ale mějte na paměti, že znaky mimo ISO-"
-#~ "8859-1 budou ztraceny.\n"
-#~ "\n"
-#~ "Pokud je zvolena odlišná znaková sada, bude použita namísto ISO-8859-1.\n"
-#~ "Mohou být nadefinována pravidla pro případ, že některé znaky nemohou být "
-#~ "převedeny."
-
-#~ msgid ""
-#~ "Try to save tags to ISO-8859-1. If it isn't possible then use UNICODE "
-#~ "(recommended)"
-#~ msgstr ""
-#~ "Vyzkoušet uložení tagu v ISO-8859-1. Pokud to není možné, použít UNICODE "
-#~ "(doporučeno)"
-
-#~ msgid ""
-#~ "The UNICODE character set will be used if conversion to ISO-8859-1 fails. "
-#~ "Unicode can be used for ID3v2 but not for the ID3v1 tags which use only a "
-#~ "single byte character set (by default ISO-8859-1).\n"
-#~ "\n"
-#~ "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.\n"
-#~ "Also some rules can be defined if some characters can't be converted."
-#~ msgstr ""
-#~ "Pokud převod do ISO-8859-1 selže, použije se znaková sada UNICODE. "
-#~ "Unicode může být použito pro ID3v2, nikoli pro ID3v1 tagy, které "
-#~ "používají single byte znakovou sadu (výchozí je ISO-8859-1).\n"
-#~ "\n"
-#~ "Pokud je vybrána odlišná znaková sada, použije se namísto ISO-8859-1.\n"
-#~ "Mohou být nadefinována pravidla pro případ, že některé znaky nemohou být "
-#~ "převedeny."
-
-#~ msgid "Always save tags to UNICODE character set"
-#~ msgstr "Vždy ukládat tagy ve znakové sadě UNICODE"
-
-#~ msgid ""
-#~ "Use UNICODE character set for ID3v2 tags. The ID3v1 tags are always saved "
-#~ "with a single byte character set (by default ISO-8859-1).\n"
-#~ "\n"
-#~ "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 ""
-#~ "Použít UNICODE pro ID3v2 tagy. ID3v1 tagy budou vždy uloženy v single "
-#~ "byte znakové sadě (výchozí ISO-8859-1).\n"
-#~ "\n"
-#~ "Pokud je vybrána jiná znaková sada, použije se namísto ISO-8859-1."
-
 #~ msgid ""
-#~ "For ISO-8859-1 fields, override with the following character encodings "
-#~ "(for expert users only!): "
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
 #~ msgstr ""
-#~ "Pole s ISO-8859-1 přepsat následující znakovou sadou (pouze pro experty):"
+#~ "Zadaná cesta je neplatná!:\n"
+#~ "%s\n"
+#~ "(%s)"
 
-#~ msgid "Use non standard character set for reading ID3 tags: "
-#~ msgstr "Použít nestandardní znakovou sadu pro čtení ID3 tagů:"
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(podpora MP3 zapnuta, používá: libid3tag %s)"
 
-#~ msgid "Use non standard character set for writing ID3 tags: "
-#~ msgstr "Použít nestandardní znakovou sadu pro zápis ID3 tagů:"
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(podpora ID3v2.3 tagů zapnuta, používá: id3lib %d.%d.%d)"
 
-#~ msgid ""
-#~ "This character set will be used when writing the tag data, to convert "
-#~ "each string saved in an ISO-8859-1 field in the tag (for ID3v2 or/and "
-#~ "ID3v1 tag)."
-#~ msgstr ""
-#~ "Tato znaková sada bude použita pro zápis tagů při konverzi řetězců "
-#~ "uložených v ISO-8859-1 (pro ID3v2 nebo / a ID3v1)."
-
-#~ msgid ""
-#~ "For ISO-8859-1 fields, apply also these rules if some characters can't be "
-#~ "converted when writing tags:"
-#~ msgstr ""
-#~ "Pro pole s ISO-8859-1 použít tato pravidla v případě, že některé znaky "
-#~ "nemohou být převedeny:"
-
-#~ msgid "Do nothing"
-#~ msgstr "Nedělat nic"
-
-#~ msgid "Force using the character encoding and activate the transliteration"
-#~ msgstr "Vnutit použití znakové sady a aktivovat transliteraci"
-
-#~ msgid ""
-#~ "Force using the character encoding and silently discard some characters"
-#~ msgstr "Vnutit používání znakové sady a zahazovat některé znaky"
-
-#~ msgid ""
-#~ "The character set translation from '%s'\n"
-#~ "to '%s' isn't supported!"
-#~ msgstr ""
-#~ "Konverze znakové sady z '%s'\n"
-#~ "do '%s' není podporována!"
+#~ msgid "Loaded File Content :"
+#~ msgstr "Načten obsah souboru :"
 
-#~ msgid "ERROR while opening file: '%s' (%s)"
-#~ msgstr "CHYBA při otevírání souboru: '%s' (%s)"
+#~ msgid "Files Name List :"
+#~ msgstr "Seznam souborů :"
 
-#~ msgid "Load on startup the directory"
-#~ msgstr "Načítat soubory v adresáři ihned po spuštění"
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Nahradí znak jiným znakem."
diff --git a/po/da.gmo b/po/da.gmo
index 3079c8e..573e145 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 26a3b07..449e3d4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag 1.99.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2005-12-18 14:36+0200\n"
 "Last-Translator: Morten Brix Pedersen <morten@wtf.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
@@ -29,189 +29,231 @@ msgstr ""
 "Ogg Vorbis, MP4/AAC, MusePack og Monkey's Audio-filer. Det er en simpel og "
 "lækker GTK+ grænseflade, som gør mærkning nemmere under GNU/Linux."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(Tysk oversættelse)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(Russisk oversættelse)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(Hollandsk oversættelse)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(Svensk oversættelse)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(Ungarsk oversættelse)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(Italiensk oversættelse)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(Japansk oversættelse)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(Ukrainsk oversættelse)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(Tjekkisk oversættelse)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(Spansk oversættelse)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(Polsk oversættelse)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(Rumænsk oversættelse)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(Dansk oversættelse)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(Græsk oversættelse)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Brasiliansk-portugisisk oversættelse)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(Bulgarsk oversættelse)"
 
-#: src/about.c:160
+#: src/about.c:171
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(Japansk oversættelse)"
 
-#: src/about.c:161
+#: src/about.c:172
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(Græsk oversættelse)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(Tysk oversættelse)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Kommentar"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "Om..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "Om"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(kompileret: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(bruger: GTK+ %d.%d.%d og id3lib %d.%d.%d)"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(MP3 filunderstøttelse slået fra)"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "Forfatter: %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(MP3 filunderstøttelse slået fra)"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "E-mail: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Hjemmeside: "
 
-#: src/about.c:292
+#: src/about.c:328
+msgid "Description:"
+msgstr "Beskrivelse:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "(MP3 filunderstøttelse slået fra)"
 
-#: src/about.c:296
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
 #, c-format
-msgid "(MP3 file support disabled)"
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
 msgstr "(MP3 filunderstøttelse slået fra)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "Ingen tilgængelige hukommelse"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(Ogg Vorbis filunderstøttelse slået fra)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(MP3 filunderstøttelse slået fra)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(FLAC filunderstøttelse slået fra)"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
 msgstr "(MP4/AAC filunderstøttelse slået fra)"
 
-#: src/about.c:322
+#: src/about.c:460
 #, fuzzy
-msgid "(WavPack file support disabled)"
+msgid "WavPack file support"
 msgstr "(MP3 filunderstøttelse slået fra)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "Forfatter: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-mail: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Hjemmeside: "
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "Beskrivelse:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "Tak"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "Oversættelser:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "Generelt:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "Ændringer"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -544,7 +586,7 @@ msgstr "Omdøb mappe ..."
 msgid "Reload Directory"
 msgstr "Genindlæs mappe"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "Gennemse mappe med ..."
 
@@ -689,7 +731,7 @@ msgstr "Ny standardsti for filer valgt"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Bekræft..."
 
@@ -701,87 +743,66 @@ msgstr ""
 "Nogle filer er blevet ændret, men ikke gemt...\n"
 "Vil du gemme dem, før du ændrer mappe?"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"Den indtastede sti er ugyldig!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "Fejl..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 #, fuzzy
 msgid "<All albums>"
 msgstr "# Albums"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, 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:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "Kunstner"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# Albums"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# Filer"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Gå et niveau op"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Indtast en mappe at gennemse."
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Træ"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "Kunstner & Album"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "Omdøb mappen"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Omdøb mappen '%s' til : "
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "Brug maske :"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 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:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -789,21 +810,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:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "Ugyldig scanner maske"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "Omdøb mappeforvisning..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Fejl..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "Du skal indtaste et mappenavn!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, 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."
@@ -830,7 +861,7 @@ msgstr "Kunne ikke konvertere '%s' til filnavnets tegnsæt. Brug et andet navn."
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -839,7 +870,7 @@ msgstr ""
 "Kan ikke omdøbe fordi det mappenavn allerede findes!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -854,51 +885,51 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "Mappe omdøbt"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Program der skal køres :"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 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:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "Åbn fil med ..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 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:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "Du skal indtaste et programnavn!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Programmet '%s' blev ikke fundet!"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Kan ikke køre %s (fejl %d)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "Kan ikke 'fork' endnu en process!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Kørte kommando : '%s %s'"
@@ -988,7 +1019,7 @@ msgstr "Søg i :"
 msgid "All Fields"
 msgstr "Alle felter"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Andre"
 
@@ -1063,7 +1094,7 @@ msgstr " Kategorier "
 msgid "Results :"
 msgstr "Resultater :"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "Søg :"
 
@@ -1092,7 +1123,7 @@ msgstr "Fravælg alle linjer"
 msgid "Invert lines selection"
 msgstr "Invertér linjevalg"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "Vælg alle linjer"
 
@@ -1117,15 +1148,15 @@ msgstr "Sæt ind i :"
 msgid "All"
 msgstr "Alle"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "Filnavn"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "Titel"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "År"
 
@@ -1137,12 +1168,12 @@ msgstr "Spor #"
 msgid "# Tracks"
 msgstr "# Spor"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "Genre"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Kør den nuværende scanner for hver enkel fil"
 
@@ -1154,7 +1185,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1172,87 +1203,87 @@ msgstr ""
 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:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Klar til at søge..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, 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:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Invertér valg"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Sortér efter spornummer"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Sortér efter spornavn"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Slår værtsnavn '%s' op ..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Kunne ikke slå værtsnavn '%s' op (%s)!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, 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:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Forbinder til vært '%s', port '%d' ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Kan ikke forbinde til vært '%s' (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Forbundet til vært '%s'"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Modtager svar (%s) ..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, 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:1765
+#: src/cddb.c:1770
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Kan ikke oprette eller åbne fil '%s' (%s)\n"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Kan ikke åbne fil '%s' (%s)"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "Sender anmodning ..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Kunne ikke sende anmodning (%s)!"
@@ -1261,91 +1292,91 @@ msgstr "Kunne ikke sende anmodning (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "Modtager data ..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "Serveren returnerede forkert svar! (%s)"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Serveren returnerede forkert svar! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Desværre, web-baseret søgning virker ikke i øjeblikket!"
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Fandt %d matchende album(s)"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Modtager svar (%s) ..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Modtager svar (%s) ..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d fil(er) valgt"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Klar til at søge..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, 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:3231
+#: src/cddb.c:3268
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Fandt %d matchende album(s)"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, 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:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "Henter albums sporliste ..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1358,7 +1389,7 @@ msgstr ""
 "\n"
 "Vil du fortsætte?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "Skriver mærke fra CDDB..."
 
@@ -1630,11 +1661,11 @@ msgstr "Fillænke ødelagt"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
@@ -1642,7 +1673,7 @@ msgstr "?, Layer ?"
 msgid "Bitrate:"
 msgstr "Bithastighed:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1650,17 +1681,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Frek:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mode:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1843,13 +1874,13 @@ msgid "Tag selected files with these pictures"
 msgstr "Mærk valgte filer med disse billeder"
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
-msgstr "Fjern valgte billeder, ellers alle billeder."
-
-#: src/easytag.c:1051
 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:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "Fjern valgte billeder, ellers alle billeder."
+
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "Gem de valgte billeder på harddisken."
@@ -2222,7 +2253,7 @@ msgstr "Slet fil..."
 msgid "File '%s' deleted"
 msgstr "Fil '%s' slettet"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2234,109 +2265,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "Søgning i gang..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "Fil: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, 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:3235
+#: src/easytag.c:3239
 #, 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:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u fil(er)"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr "Ingen filer fundet i denne mappe og undermapper!"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "Ingen fil fundet i denne mappe!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Søger..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "  STOP søgningen...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "Vælg en mappe at gennemse!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "Mærk valgte filer med dette felt"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Konvertér '_' og '%20' til mellemrum"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "Konvertér ' ' til '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "Alle store bogstaver"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "All små bogstaver"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "Første bogstav stort"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "Første bogstav stort på hvert ord"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "Fjern mellemrum"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Indsæt mellemrum før store bogstaver"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 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:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Unormal afslutning! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, fuzzy, c-format
-msgid "Received signal %s (%d)"
-msgstr "Modtog signal %s (%d)\n"
+msgid "Received signal %s (%d)\a"
+msgstr "Modtog signal %s (%d)\a\n"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2346,12 +2377,12 @@ msgstr ""
 "backtrace ('gdb easytag core', så 'bt' og så 'l') og oplysninger der kan "
 "reproducere problemet til <easytag@gmail.com>"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Ukendt signal"
 
-#: src/easytag.c:4466
-#, fuzzy
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2364,8 +2395,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2384,11 +2414,11 @@ msgstr ""
 "sti_til/filer     Indlæs relativ sti.\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normal afslutning."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2396,7 +2426,7 @@ msgstr ""
 "Nogle filer er blevet ændret men ikke gemt...\n"
 "Vil du gemme dem før du afslutter programmet?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr " Vil du virkelig afslutte programmet? "
 
@@ -2494,7 +2524,7 @@ msgstr ""
 "til systemets tegnsæt\n"
 "(Prøv at sætte miljø-variablen G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "Filnavn oversættelse"
 
@@ -2527,7 +2557,7 @@ msgstr "Kanaler:"
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "FEJL ved åbning af fil: '%s' (%s).\n"
-""
+"\a"
 
 #: src/flac_tag.c:983 src/ogg_tag.c:752
 #, c-format
@@ -2657,123 +2687,123 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "Ødelagt fil..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " O.k. "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " Ja "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " Nej "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " Anvend "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " Gem "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " Annullér "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " Luk "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " Skriv "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " Kør "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr " Søg "
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr " Gennnemse... "
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "Vælg mappe..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "Vælg fil..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 #, fuzzy
 msgid "Warning..."
 msgstr "Søger..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, 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:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "Opret en spilleliste"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "M3U spillelistenavn"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "Brug mappenavn"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Redigér masker"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "Spilleliste tilvalg"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Inkludér kun de valgte filer"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2781,31 +2811,31 @@ msgstr ""
 "Hvis aktiveret, vil kun de valgte filer blive skrevet til spillelisten. "
 "Ellers, vil alle filer blive skrevet."
 
-#: src/misc.c:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "Brug fuld sti for filer i spilleliste"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 msgid "Use relative path for files in playlist"
 msgstr "Brug relativ sti for filer i spilleliste"
 
 #. Create playlist in parent directory
-#: src/misc.c:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "Opret spilleliste i et niveau højere end dette"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 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:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "Brug DOS-mappe adskiller"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2813,23 +2843,23 @@ msgstr ""
 "Denne indstilling erstatter UNIX-mappenavne adskiller '/' med DOS-adskiller "
 "'\\'."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "Spilleliste indhold"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "Skriv kun liste af filer"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "Skriv oplysninger ved hjælp af filnavn"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Skriv oplysninger med :"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2838,12 +2868,12 @@ msgstr ""
 "Spileliste fil '%s' eksisterer allerede!\n"
 "Overskriv?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "Skriv spilleliste..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2852,48 +2882,44 @@ msgstr ""
 "Kan ikke skrive spilleliste fil '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Skrev spilleliste fil '%s'"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "Spor"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Kommentar"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "Orig. kunstner"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Ophavsret"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "URL"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "Encoded af"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "Søg efter en fil"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2901,54 +2927,93 @@ msgstr ""
 "alle filer blive vist."
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "I :"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "mærket"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Forskel på store og små bogstaver"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Fandt : %d fil(er)"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "Hent filnavne fra TXT fil"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 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:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " Indlæs "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "Indlæst filindhold :"
+#: src/misc.c:2810
+#, 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:2831 src/misc.c:2925
+#, 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:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Slet denne linje"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "Filnavne liste :"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "Slet alle blanke linje"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, 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:2870 src/misc.c:2964
+#, 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:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Genindlæs"
 
-#: src/misc.c:2828
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Skriv kun liste af filer"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Vælg alle linjer"
+
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2956,21 +3021,23 @@ 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:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "Indsæt en blank linje"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "Slet denne linje"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "Slet alle blanke linje"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Flyt denne maske op"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "Genindlæs"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Flyt denne maske ned"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3105,111 +3172,111 @@ msgstr ""
 msgid "Save file..."
 msgstr "Gem fil..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "JPEG-billede"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "PNG-billede"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "Ukendt billede"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 billedpunkter, PNG filikon"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "Andet filikon"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "Cover (forside)"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "Cover (bagside)"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "Brochure side"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "Medie (f.eks. mærkesiden af CD'en)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "Hovedkunstner"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "Kunstner/optræder"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "Leder"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "Band/orkester"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "Lyrik skriver"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "Optagelsesplacering"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "Under optagelse"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "Under optræden"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "Film/video skærmbillede"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "En lys farvet fisk"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "Illustration"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "Band/Kunstner logotype"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "Udgiver/studie logotype"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "Ukendt billedtype"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "billedpunkter"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "Type"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3217,11 +3284,11 @@ msgstr ""
 "Kan ikke vise billedet, eftersom ikke nok data er blevet læst der kan "
 "bestemme hvordan billedbufferen skal oprettes."
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "Indlæser billedfil..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3232,7 +3299,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "Billedfil ikke indlæst..."
 
@@ -3487,23 +3554,52 @@ msgstr ""
 "kan blive givet til programmet (som f.eks. 'xmms -p') for at angive filer "
 "som næste argument."
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Mærke tilvalg"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "Hovedvinduets centrum"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr ""
+"Hvis aktiveret, vil spillelisten blive oprettet i mappen et niveau højere "
+"end dette."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "Filindstillinger"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "Filnavn indstillinger"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr "Erstat ugyldige karakterer i filnavn (for Windows og CD-rom)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3516,40 +3612,40 @@ msgstr ""
 "med scanneren."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "Konvertér filnavn endelse til :"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "Små bogstaver"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "For eksempel: Endelsen vil blive konverteret til '.mp3'"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "Store bogstaver"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "For eksempel: Endelsen vil blive konverteret til '.MP3'"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "Ingen ændringer"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "Endelsen vil ikke blive konverteret"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "Oprethold ændringstidspunktet af filen"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
@@ -3557,13 +3653,13 @@ msgstr ""
 "på filen."
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3574,12 +3670,12 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr "Tegnsæt for filnavn"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
@@ -3587,11 +3683,11 @@ msgstr ""
 "Regler der skal anvendes hvis nogle tegn ikke kan konverteres til "
 "systemtegnsættet når filnavn skal skrives:"
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "Prøv et andet tegnsæt"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
@@ -3601,12 +3697,12 @@ msgstr ""
 "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:519
+#: 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:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3615,13 +3711,13 @@ 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:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr "Tving til at bruge systemtegnsæt og smid nogle tegn væk"
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3632,20 +3728,20 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "Mærke indstillinger"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "Mærke tilvalg"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "Auto-færdiggør dato hvis ikke færdig"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3655,11 +3751,11 @@ msgstr ""
 "datoen (f.eks., hvis det nuværende år er 2005: 5 => 2005, 4 => 2004, 6 => "
 "1996, 95 => 1995, ...)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "Skriv sporfeltet med det følgende antal cifre :"
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3669,11 +3765,11 @@ msgstr ""
 "til at opnå et tal med 'n' cifre (f.eks. two cifre: '05', '09', '10',...). "
 "Ellers vil den beholde den 'rå' spor værdi."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Ogg Vorbis filer : Skriv også kommentaren til XMMS format"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3687,17 +3783,17 @@ msgstr ""
 "have andre programmer til at klage om et ukendt felt. Kommentarer vil dog "
 "ikke blive vist i XMMS."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr "Mærke-felt fokus når der skiftes filer med genveje Page Up/Page Down:"
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr "Hold fokus til samme mærke-felt"
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr "Returnér fokus til første mærke-felt (f.eks. 'Titel'-feltet)"
 
@@ -3705,22 +3801,22 @@ msgstr "Returnér fokus til første mærke-felt (f.eks. 'Titel'-feltet)"
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "ID3 mærke indstillinger"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "ID3 mærke regler"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 #, fuzzy
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "Skriv ID3 mærker i FLAC filer med FLAC mærke"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3730,11 +3826,11 @@ msgstr ""
 "over."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "Fjern mærker hvis alle felter er sat til blankt"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3747,11 +3843,11 @@ msgstr ""
 "data felter er sat til blankt."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Automatisk konvertér gamle ID3v2 mærke versioner"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3760,42 +3856,42 @@ msgstr ""
 "opdateret til ID3v2.3 versionen."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 #, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "Skriv ID3v2 mærke"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Tegnsæt for ID3-mærker"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Skriv ID3v2 mærke"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "Skriv ID3v2 mærke"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3805,12 +3901,12 @@ msgstr ""
 "begyndelsen af MP3-filer. Ellers vil det blive fjernet."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 #, fuzzy
 msgid "Version:"
 msgstr "Beskrivelse:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3819,56 +3915,56 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Encoded af"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 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:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 #, fuzzy
 msgid "No"
 msgstr " Nej "
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ID3 mærke"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "Skriv ID3v1.x mærke"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3876,22 +3972,22 @@ 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:846
+#: src/prefs.c:878
 #, 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:878
+#: src/prefs.c:910
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Tegnsæt for ID3-mærker"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3922,31 +4018,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:914
+#: src/prefs.c:947
 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:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Udfyld mærke scanner - Karakter konvertering"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Konvertér underscore karakter '_' og streng '%20' til mellemrum ' '"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Konvertér mellemrum ' ' til underscore '_'"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -3955,11 +4051,11 @@ msgstr ""
 "fra scanneren for mærker."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Omdøb filscanner - Karakter konvertering"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -3968,18 +4064,18 @@ msgstr ""
 "i scanneren for filnavne."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 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:1001
+#: src/prefs.c:1034
 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:1005
+#: src/prefs.c:1038
 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 "
@@ -3990,15 +4086,15 @@ msgstr ""
 "f.eks. 'feat.' (featuring)."
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Scannervindue"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Åbn scannervindue ved opstart"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4006,11 +4102,11 @@ msgstr ""
 "Aktiver denne indstilling for automatisk at åbne scannervinduet når EasyTAG "
 "starter."
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Scannervindue altid øverst"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4019,16 +4115,16 @@ msgstr ""
 "hovedvinduet."
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "Felter"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Overskriv felter når der scannes efter mærker"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4036,11 +4132,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:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "Sæt denne tekst som standard kommentar :"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4049,11 +4145,11 @@ msgstr ""
 "kommentar feltet når der bruges 'Udfyld mærke' scanneren."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 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:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4064,46 +4160,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "CDDB"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Automatisk søgning"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "Navn :"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "CGI-sti :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Serverindstillinger"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "CDDB"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 #, fuzzy
 msgid "Path :"
 msgstr "CGI-sti :"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4112,58 +4208,58 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Mellemværtsindstillinger"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Brug en mellemvært"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Aktivér mellemværtsindstillinger"
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "Værtsnavn :"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Navn på mellemværtsserveren."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Port på mellemværtsserveren."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "Brugernavn :"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "Navn på bruger for mellemværten."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "Bruger adgangskode :"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr "Brugerens adgangskoden til mellemværten."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "Spornavn liste"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 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:1320
+#: src/prefs.c:1353
 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."
@@ -4172,7 +4268,7 @@ msgstr ""
 "tilsvanrede lydfil i hovedlisten også blive valgt."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4183,15 +4279,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Bekræftelse"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Bekræft afslutning fra programmet"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4199,53 +4295,57 @@ msgstr ""
 "Hvis aktiveret, åbnes en dialogboks for at spørge om bekræftelse før "
 "afslutning af programmet."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "Bekræft skrivning af filmærke"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "Bekræft omdøbning af fil"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "Bekræft sletning af fil"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "Bekræft skrivning af spilleliste"
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Anvend ændringer (men gem ikke) og luk dette vindue"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "Luk dette vinduet uden at gemme"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 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:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Eksempel : %.*d_-_Spor_navn_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "Ændringer anvendt"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "Opsætning gemt"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "Opsætning uændret"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4256,11 +4356,11 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "Ikke en mappe"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Lydafspilleren '%s' blev ikke fundet!"
@@ -4277,36 +4377,36 @@ msgstr "Omdøb fil og mappe"
 msgid "Process Fields"
 msgstr "Behandl felter"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "Mærke succesfuldt scannet..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Mærke succesfuldt scannet...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, 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:660
+#: src/scan.c:663
 #, 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:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "Nyt filnavn succesfuldt scannet..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nyt filnavn succesfuldt scannet...(%s)"
@@ -4314,41 +4414,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "Mærk og filnavns scan"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Scanner :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "Vælg scannertypen"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Åbn scannervindue / Scan valgte filer"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Scanner indstillinger"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Vis / Skjul maske redigering"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Vis / Skjul signatur"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "Luk dette vindue"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4357,15 +4457,15 @@ msgstr ""
 "filnavne og sti. Brugt til at udfylde i mærke-felter."
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "Udfyld-mærke forvisning..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr "Præfiks maske med nuværende sti"
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4378,15 +4478,15 @@ msgstr ""
 "sti, ellers er den relativ til den gamle sti."
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "Omdøb filforvisning..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Vælg felter:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4395,126 +4495,126 @@ msgstr ""
 "dem som har din interesse."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "Behandl filnavnsfelt"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "Behandl titel felt"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "K"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "Behandl kunstnerfelt"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "A"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Behandl album felt"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "Behandl genre felt"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "Ko"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "Behandl kommentar felt"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "Op"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Behandl komponist felt"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 msgid "Process original artist field"
 msgstr "Behandl original kunstner felt"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Oh"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Behandl ophavsret felt"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "Behandl URL felt"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "Behandl encoder-navn felt"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Invertér valg"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Vælg/fravælg alle."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Konvertér '_' og '%20' til ' '"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Konvertér :"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "til : "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4522,7 +4622,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:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4530,11 +4630,12 @@ msgstr ""
 "Mellemrumskarakteren er erstattet af en underscore-karakter. F.eks.:, før: "
 "'Text In An Entry', efter: 'Text_In_An_Entry'."
 
-#: src/scan.c:2171
-msgid "Replace a character by an other one."
-msgstr "Erstat en karakter med en anden"
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4542,7 +4643,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:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4550,7 +4651,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:2209
+#: src/scan.c:2325
 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'."
@@ -4558,7 +4659,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:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4566,15 +4667,15 @@ 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:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Indsæt et mellemrum før et stort bogstav"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "Fjern dubletter af mellemrum og underscores"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4582,7 +4683,7 @@ msgstr ""
 "Alle mellemrum mellem ord er fjernet. F.eks., før: 'Text In An Entry', "
 "efter: 'TextInAnEntry'."
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4590,7 +4691,7 @@ msgstr ""
 "Et mellemrum er indsat før hvert store bogstav. F.eks., før: "
 "'TextInAnEntry', efter: 'Text In An Entry'."
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4601,190 +4702,190 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "Signatur"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : kunstner"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : kommentar"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p : komponist"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r : ophavsret"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : disknummer"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : encoded af"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genre"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignoreret"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : antal spor"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : orig. kunstner"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : spor"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : titel"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : år"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Maske redigering"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "Opret ny maske"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Flyt denne maske op"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Flyt denne maske ned"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Dublér maske"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Tilføj standard maskem"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "Fjern maske"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Gem masker"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "Ny_maske"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "Kopi: Ingen række valgt!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "Fjern: Ingen række valgt!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Flyt op: Ingen række valgt!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Flyt ned: Ingen række valgt!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, 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:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Kan ikke åbne opsætningsfil '%s' (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "Henter standardopsætning..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Kan ikke oprette eller åbne fil '%s' (%s)"
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
 "FEJL: Kan ikke skrive liste til fil: %s (%s)\n"
-""
+"\a"
 
 #. Fall back to defaults
-#: src/setting.c:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Indlæser standard 'Udfyld mærke' masker..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "Indlæser standard 'Omdøb fil' masker..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Indlæser standard 'Omdøb mappe' masker..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "FEJL: Miljøvariablen HOME er ikke sat!\n"
 "\n"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "FEJL: Kan ikke oprette mappe '%s' (%s)!"
@@ -4870,6 +4971,36 @@ msgstr "Kør musikafspiller"
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Den indtastede sti er ugyldig!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Forskel på store og små bogstaver"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Erstat en karakter med en anden"
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Indlæst filindhold :"
+
+#~ msgid "Files Name List :"
+#~ msgstr "Filnavne liste :"
+
+#, fuzzy
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(MP3 filunderstøttelse slået fra)"
+
+#, fuzzy
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(MP3 filunderstøttelse slået fra)"
+
 #, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "Ugyldig mærke version"
@@ -4999,10 +5130,10 @@ msgstr ""
 #~ "til '%s' er ikke understøttet!"
 
 #, fuzzy
-#~ msgid "ERROR while opening file: '%s' (%s)"
+#~ msgid "ERROR while opening file: '%s' (%s)\a"
 #~ msgstr ""
 #~ "FEJL ved åbning af fil: '%s' (%s).\n"
-#~ ""
+#~ "\a"
 
 #~ msgid "Load on startup the directory"
 #~ msgstr "Indlæs mappe ved opstart"
diff --git a/po/de.gmo b/po/de.gmo
index dbbe728..a661ee9 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 0980257..fb5616c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,17 +10,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: EasyTAG 2.1.1\n"
+"Project-Id-Version: EasyTAG 2.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
-"PO-Revision-Date: 2007-07-05 09:48+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
+"PO-Revision-Date: 2007-07-12 07:44+0200\n"
 "Last-Translator: Götz Waschk <goetz.waschk@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
@@ -31,185 +31,230 @@ msgstr ""
 "Audio-Dateien. Seine einfache und hübsche GTK+-Oberfläche macht das Taggen "
 "einfacher."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(Deutsche Übersetzung)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(Russische Übersetzung)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(Holländische Übersetzung)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(Schwedische Übersetzung)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(Ungarische Übersetzung)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(Italienische Übersetzung)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(Japanische Übersetzung)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(Ukrainische Übersetzung)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(Tschechische Übersetzung)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(Spanische Übersetzung)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(Polnische Übersetzung)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(Rumänische Übersetzung)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(Dänische Übersetzung)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(Griechische Übersetzung)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Brasilianisch Portugische Übersetzung)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(Bulgarische Übersetzung)"
 
-#: src/about.c:160
+#: src/about.c:171
 msgid "(Chinese translation)"
 msgstr "(Chinesische Übersetzung)"
 
-#: src/about.c:161
+#: src/about.c:172
 msgid "(Hebrew translation)"
 msgstr "(Hebräische Übersetzung)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(Deutsche Übersetzung)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Kommentar"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "Über..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "Über"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compiliert: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(verwendet: GTK+ %d.%d.%d)"
 
-#: src/about.c:283
+#: src/about.c:305
 #, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(MP3-Unterstützung aktiviert, verwendet: libid3tag %s)"
+msgid "Author: %s"
+msgstr "Autor: %s"
 
-#: src/about.c:287
+#: src/about.c:309 src/easytag.c:212
 #, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(ID3v2.3-Tag-Unterstützung aktiviert, verwendet: id3lib %d.%d.%d)"
+msgid "E-mail: %s"
+msgstr "E-Mail: %s"
 
-#: src/about.c:292
-msgid "(ID3v2.3 tags  support disabled)"
-msgstr "(ID3v2.3-Tag-Unterstützung deaktiviert)"
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Homepage: "
 
-#: src/about.c:296
+#: src/about.c:328
+msgid "Description:"
+msgstr "Beschreibung:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
 #, c-format
-msgid "(MP3 file support disabled)"
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
+#, fuzzy
+msgid "MP3 file support"
 msgstr "(MP3-Unterstützung deaktiviert)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+#, fuzzy
+msgid "enabled"
+msgstr "Gerahmt"
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
+#, c-format
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
+msgstr "(ID3v2.3-Tag-Unterstützung deaktiviert)"
+
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "(Nicht vorhanden!)"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(Ogg Vorbis-Unterstützung deaktiviert)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(Speex-Unterstützung deaktiviert)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(FLAC-Unterstützung deaktiviert)"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
 msgstr "(MP4/AAC-Unterstützung deaktiviert)"
 
-#: src/about.c:322
-msgid "(WavPack file support disabled)"
+#: src/about.c:460
+#, fuzzy
+msgid "WavPack file support"
 msgstr "(WavPack-Unterstützung deaktiviert)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "Autor: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-Mail: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Homepage: "
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "Beschreibung:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "Danksagung"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "Übersetzungen:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "Allgemeines:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "Änderungen"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -542,7 +587,7 @@ msgstr "Verzeichnis umbenennen..."
 msgid "Reload Directory"
 msgstr "Verzeichnis neu einlesen"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "Verzeichnis betrachten mit ..."
 
@@ -687,7 +732,7 @@ msgstr "Neuer Vorgabepfad für Dateien ausgewählt"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Bestätigen..."
 
@@ -699,90 +744,69 @@ msgstr ""
 "Einige Dateien wurden verändert, aber nicht gespeichert...\n"
 "Möchten sie diese vor dem Wechseln des Verzeichnisses speichern?"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"Der eingegebene Pfad ist ungültig!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "Fehler..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 msgid "<All albums>"
 msgstr "<Alle Alben>"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, 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:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# Alben"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# Dateien"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Zum Elternverzeichnis gehen"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Geben sie das zu durchsuchende Verzeichnis an"
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Baum"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "Künstler & Album"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "Verzeichnis umbenennen"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Benenne Verzeichnis '%s' um in : "
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "Nutze Maske :"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 "Wenn aktiviert, dann werden Masken zur Umbenennung des Verzeichnisses "
 "verwendet."
 
-#: src/browser.c:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -790,21 +814,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:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "Ungültige Scannermaske"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "Verzeichnisumbenennungsvorschau..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Fehler..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "Sie müssen einen Verzeichnisnamen angeben!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -833,7 +867,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -842,7 +876,7 @@ msgstr ""
 "Umbenennung nicht möglich, da dieser Verzeichnisname bereits existiert!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -857,51 +891,51 @@ msgstr ""
 "'%s' umbenannt werden!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "Verzeichnis umbenannt"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Programm starten:"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 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:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "Öffne Datei mit ..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 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:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "Sie müssen einen Programmnamen angeben!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Das Programm '%s' wurde nicht gefunden!"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Kann %s nicht ausführen (Fehler %d)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "Kein weiterer Prozess kann gestartet werden!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Ausgeführtes Programm: '%s %s'"
@@ -989,7 +1023,7 @@ msgstr "Suche in :"
 msgid "All Fields"
 msgstr "Alle Felder"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Andere"
 
@@ -1064,7 +1098,7 @@ msgstr "Kategorien"
 msgid "Results :"
 msgstr "Ergebnisse :"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "Suche :"
 
@@ -1094,7 +1128,7 @@ msgstr "Alle Zeilen abwählen"
 msgid "Invert lines selection"
 msgstr "Zeilenauswahl umkehren"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "Alle Zeilen auswählen"
 
@@ -1119,15 +1153,15 @@ msgstr "Setze ein :"
 msgid "All"
 msgstr "Alle"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "Dateiname"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "Titel"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "Jahr"
 
@@ -1139,12 +1173,12 @@ msgstr "Stück #"
 msgid "# Tracks"
 msgstr "# Stücke"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "Genre"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Aktuellen Scanner für alle Dateien ausführen"
 
@@ -1156,7 +1190,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1174,87 +1208,87 @@ msgstr ""
 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:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Bereit zur Suche..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, 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:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Auswahl umkehren"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Sortiere nach Stücknummer"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Sortiere nach Stücknamen"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Suche Rechner '%s' ..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Kann Rechner '%s' nicht finden (%s)!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, 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:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Verbinde mit Rechner '%s' Port '%d' ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Kann keine Verbindung zu '%s' aufbauen (%s)! "
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Verbunden mit Rechner '%s'"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Empfange Daten (%s) ..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Fehler beim Lesen der CDDB-Anfrage (%s)!"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Datei '%s' kann nicht angelegt werden (%s)"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, 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);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "Sende Anfrage ..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Kann die Anfrage nicht senden (%s)!"
@@ -1263,62 +1297,62 @@ msgstr "Kann die Anfrage nicht senden (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "Empfange Daten ..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 msgid "The server returned a wrong answer!"
 msgstr "Der Server hat eine falsche Antwort gegeben!"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Der Server hat eine falsche Antwort gegeben! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Entschuldigung, die Web-basierte Suche funktioniert gerade nicht."
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "%d passende Alben gefunden."
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Empfange Daten der Seite %d (Album %d/%d)..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Empfange Daten der Seite %d ..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr "Mehr Ergebnisse zu laden ..."
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 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:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d Datei(en) ausgewählt!"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 msgid "Local CD search..."
 msgstr "Lokale CD-Suche..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
@@ -1327,27 +1361,27 @@ msgstr ""
 "Stellen sie ihn im Einstellungsfenster ein."
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, 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:3231
+#: src/cddb.c:3268
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "%d passende Alben für die DiscID '%s' gefunden."
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, 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:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "Lade Titelliste des Albums ..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1360,7 +1394,7 @@ msgstr ""
 "\n"
 "Wollen sie weitermachen?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "Schreibe Tag aus CDDB..."
 
@@ -1635,11 +1669,11 @@ msgstr "Datei-Link kaputt"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Ebene ?"
 
@@ -1647,7 +1681,7 @@ msgstr "?, Ebene ?"
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1655,17 +1689,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Frequenz:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Modus:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1848,13 +1882,13 @@ msgid "Tag selected files with these pictures"
 msgstr "Diese Bilder in allen ausgewählten Dateien eintragen"
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
-msgstr "Entferne ausgewählter Bilder, sonst alle Bilder."
-
-#: src/easytag.c:1051
 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:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "Entferne ausgewählter Bilder, sonst alle Bilder."
+
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "Speichere ausgewählte Bilder auf der Festplatte."
@@ -2228,7 +2262,7 @@ msgstr "Datei löschen..."
 msgid "File '%s' deleted"
 msgstr "Datei '%s' gelöscht"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2240,109 +2274,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "Suche läuft..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "Datei: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, 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:3235
+#: src/easytag.c:3239
 #, 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:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u Datei(en)"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr "Keine Datei in diesem Verzeichnis oder Unterverzeichnissen gefunden!"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "Keine Datei in diesem Verzeichnis gefunden!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Suche..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "Suche ABBRECHEN...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "Wählen sie ein Verzeichnis aus!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "Dieses Feld in allen ausgewählten Dateien eintragen"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "'_' und '%20' in Leerzeichen umwandeln"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "' ' in '_' umwandeln"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "Alles groß schreiben"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "Alles klein schreiben"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "Ersten Buchstaben groß schreiben"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "Der erste Buchstabe jeden Wortes wird groß geschrieben"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "Leerzeichen entfernen"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Vor Großbuchstaben ein Leerzeichen einfügen"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 msgid "Remove duplicate spaces or underscores"
 msgstr "Doppelte Leerzeichen oder Unterstriche entfernen"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Fehlerhaft beendet! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, c-format
-msgid "Received signal %s (%d)"
-msgstr "Signal %s (%d) empfangen "
+msgid "Received signal %s (%d)\a"
+msgstr "Signal %s (%d) empfangen \a"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2352,11 +2386,12 @@ msgstr ""
 "Fehlerbericht mit einem GDB-Backtrace ('gdb easytag core', dann 'bt' und "
 "'l') an <easytag@gmail.com>"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Unbekanntes Signal"
 
-#: src/easytag.c:4466
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2369,8 +2404,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2390,11 +2424,11 @@ msgstr ""
 "Pfad_zu/Dateien         verwende relativen Pfad.\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normal beendet."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2402,7 +2436,7 @@ msgstr ""
 "Einige Dateien wurden verändert, aber nicht gespeichert...\n"
 "Möchten sie diese vor Beendigung des Programms speichern?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr " Wollen sie das Programm wirklich beenden? "
 
@@ -2498,7 +2532,7 @@ msgstr ""
 "Dateinamenskodierung des Systems konvertiert werden.\n"
 "(Versuchen sie, die Umgebungsvariable G_FILENAME_ENCODING zu setzen)."
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "Dateinamensübersetzung"
 
@@ -2669,122 +2703,122 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "Beschädigte Datei..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr "Logbuch"
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " OK "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " Ja "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " Nein "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " Anwenden "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " Speichern "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " Abbrechen "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " Schließen "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " Schreiben "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr "Ausführen "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr "Suche "
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr "Auswahl..."
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "Wähle Verzeichnis..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "Datei auswählen..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "Warning..."
 msgstr "Warnung..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr "Kein Musikprogramm vorgegeben!"
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, 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:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "Erzeuge eine Wiedergabeliste"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "M3U-Wiedergabelistenname"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "Nutze Verzeichnisnamen"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Bearbeite Masken"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "Wiedergabelisten-Optionen"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Nur ausgewählte Dateien einfügen"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2792,31 +2826,31 @@ msgstr ""
 "Wenn aktiviert, dann werden nur die ausgewählten Dateien in die "
 "Wiedergabeliste geschrieben, ansonsten werden alle Dateien verwendet."
 
-#: src/misc.c:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "Benutze vollen Pfad für Dateien in der Wiedergabeliste"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 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:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "Erzeuge Wiedergabeliste im Elternverzeichnis"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 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:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "Nutze DOS-Verzeichnistrennsymbol"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2824,23 +2858,23 @@ msgstr ""
 "Diese Option ersetzt das UNIX-Verzeichnistrennzeichen '/' durch das DOS-"
 "Zeichen '\\'."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "Inhalt der Wiedergabeliste"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "Nur Liste der Dateien schreiben."
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "Verwende Dateinamen beim Schreiben der Informationen"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Schreibe Information mit :"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2849,12 +2883,12 @@ msgstr ""
 "Wiedergabelistendatei '%s' existiert bereits!\n"
 "Überschreiben?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "Schreibe Wiedergabeliste..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2863,48 +2897,44 @@ msgstr ""
 "Kann Wiedergabelistendatei '%s' nicht schreiben!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Wiedergabelistendatei '%s' wurde geschrieben."
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "Stück #"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Kommentar"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "Originalkünstler"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "URL"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "Kodierer"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "Suche eine Datei"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2912,54 +2942,93 @@ msgstr ""
 "zur Anzeige aller Dateien."
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "In :"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "das Tag"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Groß/Kleinschreibung beachten"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Gefunden : %d Datei(en)"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "Lade die Dateinamen aus einer Textdatei"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 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:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr "Laden "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "Geladener Dateiinhalt :"
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "Umbenennen der Datei bestätigen"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "Vor einem Großbuchstaben ein Leerzeichen einfügen"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "Dateinamensliste :"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Diese Zeile löschen"
 
-#: src/misc.c:2828
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "Lösche alle Leerzeilen"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "Kein Pfad ausgewählt!"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "Nur ausgewählte Dateien einfügen"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Neu Laden"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Nur Liste der Dateien schreiben."
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Alle Zeilen auswählen"
+
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2967,21 +3036,23 @@ 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:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "Füge eine Leerzeile ein"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "Diese Zeile löschen"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "Lösche alle Leerzeilen"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Maske nach oben bewegen"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "Neu Laden"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Maske nach unten bewegen"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3120,111 +3191,111 @@ msgstr ""
 msgid "Save file..."
 msgstr "Datei speichern..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "JPEG-Bild"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "PNG-Bild"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "Unbekanntes Bild"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32-Pixel PNG-Symboldatei"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "Andere Symboldatei"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "Frontcover"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "Rückseite"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "Faltblatt"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "Medium (z.B. Label der CD)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "Führender Künstler/Darsteller/Solist"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "Künstler/Darsteller"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "Band/Orchester"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "Lyriker/Textautor"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "Aufnahmeort"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "Während der Aufnahme"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "Während der Aufführung"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "Film/Video-Bildschirmfoto"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "Ein heller, farbiger Fisch"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "Illustration"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "Band/Künstlerlogo"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "Verlags/Studiologo"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "Unbekannter Bildtyp"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "Pixel"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "Typ"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3232,11 +3303,11 @@ msgstr ""
 "Das Bild kann nicht angezeigt werden, da nicht genug Daten zur Erzeugung "
 "eines Bildpuffers geladen werden konnten."
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "Lade Bilddatei..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3247,7 +3318,7 @@ msgstr ""
 "%s' !\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "Bilddatei nicht geladen..."
 
@@ -3505,23 +3576,52 @@ msgstr ""
 "Gib das Programm zum Abspielen der Dateien an. Einige Argumente können dem "
 "Programm übergeben vor den Dateinamen übergeben werden (z.B. 'xmms -p')."
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Tag-Optionen"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "Mitte des Hauptfensters"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr ""
+"Wenn aktiviert, dann wird die Wiedergabelistendatei im Elternverzeichnis "
+"erzeugt."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "Dateieinstellungen"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "Dateioptionen"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr "Ersetze illegale Zeichen im Dateinamen (für Windows und CD-ROM)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3534,40 +3634,40 @@ msgstr ""
 "Umbenennen der Datei über die Tags mit dem Scanner."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "Wandle Dateinamenserweiterung in :"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "Kleinbuchstaben"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "Die Erweiterung wird beispielsweise nach '.mp3' konvertiert."
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "Großbuchstaben"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "Die Erweiterung wird beispielsweise nach '.MP3' konvertiert."
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "Keine Änderungen"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "Die Erweiterung wird nicht konvertiert."
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "Bewahre Änderungsdatum der Datei"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
@@ -3575,13 +3675,15 @@ msgstr ""
 "Datei."
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
+"Aktualisiere die Änderungszeit des Elternverzeichnisses der Datei (empfohlen "
+"für Amarok)"
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3590,14 +3692,17 @@ msgid ""
 "performance reasons, they refresh file informations by detecting changes of "
 "the parent directory."
 msgstr ""
+"Die Änderungszeit des Elternverzeichnisses der Datei wird aktualisiert beim "
+"Speichern der Datei. Zur Zeit passiert dsa nur automatisch beim Umbenennen "
+"einer Datei."
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr "Zeichensatz für Dateinamen"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
@@ -3605,11 +3710,11 @@ msgstr ""
 "Anzuwendende Regeln, wenn einige Zeichen beim Schreiben das Dateinamens "
 "nicht in die Systemzeichenkodierung umgewandelt werden können:"
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "Verwende eine andere Zeichenkodierung"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
@@ -3620,12 +3725,12 @@ msgstr ""
 "8859-2 für 'ro'). Wenn das fehlschlägt, wird die Kodierung ISO-8859-1 "
 "versucht."
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "Erzwinge die Systemzeichenkodierung und aktiviere die Transliteration"
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3634,14 +3739,14 @@ msgstr ""
 "Mit dieser Einstellung wird ein Zeichen, das nicht im Zielzeichensatz "
 "existiert, durch ein oder mehrere ähnlich aussehende Zeichen ersetzt."
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
 "Erzwinge die Systemzeichenkodierung und lasse einige Zeichen einfach weg"
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3652,21 +3757,21 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "Tag-Einstellungen"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "Tag-Optionen"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr ""
 "Automatische Vervollständigung des Datums falls dieses nicht vollständig ist"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3679,11 +3784,11 @@ msgstr ""
 "(Beispiel, aktuelles Jahr 2005: 5 => 2005, 4 => 2004, 6 => 1996, 95 => "
 "1995, ...)"
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "Schreibe die Stück-Nummer mit der folgenden Stellenanzahl :"
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3693,11 +3798,11 @@ msgstr ""
 "verwendet und die Ziffer '0' zum Auffüllen benutzt (z.B. mit zwei Zeichen: "
 "'05', '09', '10'...). Ansonsten wird der 'rohe' Wert verwendet."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Ogg Vorbis-Dateien: Den Kommentar auch in das XMMS-Format schreiben"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3712,18 +3817,18 @@ msgstr ""
 "über ein unbekanntes Feld beschweren. Dann wird aber in XMMS der Kommentar "
 "nicht angezeigt."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr ""
 "Fokus beim Wechsel zwischen Dateien in der Liste mit Bild Hoch/Bild Runter:"
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr "Lasse Fokus auf dem gleichen Eingabefeld"
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr "Wechsel den Fokus zurück zum 'Titel'-Feld"
 
@@ -3731,21 +3836,21 @@ msgstr "Wechsel den Fokus zurück zum 'Titel'-Feld"
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "ID3-Tag-Einstellungen"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "ID3-Tag-Regeln"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "Schreibe ID3-Tags in FLAC-Dateien (zusätzlich zum FLAC-Tag)"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3755,11 +3860,11 @@ msgstr ""
 "entfernt."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "Tags werden entfernt wenn alle Felder leer sind"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3772,11 +3877,11 @@ msgstr ""
 "wenn alle der sieben Standard-Datenfelder leer sind."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Automatisch alte ID3v2-Versionen konvertieren"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3785,39 +3890,39 @@ msgstr ""
 "ID3v2.2) auf die ID3v2.3-Version aktualisiert."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr "Use CRC32"
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "Setze CRC32 in ID3v2-Tags"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr "Verwende Komprimierung"
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr "Verwende Komprimierung in den ID3v2-Tags"
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 msgid "Character Set for writing ID3 tags"
 msgstr "Zeichensatz für das Schreiben von ID3-Tags"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 msgid "ID3v2 tags"
 msgstr "ID3v2-Tags"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "ID3v2-Tag schreiben"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -3826,11 +3931,11 @@ msgstr ""
 "hinzugefügt oder aktualisiert. Anderenfalls wird der Tag entfernt."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 msgid "Version:"
 msgstr "Version:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3842,52 +3947,52 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr "Zeichensatz:"
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 msgid "Unicode "
 msgstr "Unicode "
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 msgid "Unicode type to use"
 msgstr "Unicode-Typ"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 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:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr "Weitere Einstellungen für iconv():"
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 msgid "No"
 msgstr "Keine"
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 msgid "ID3v1 tags"
 msgstr "ID3v1-Tag"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "ID3v1.x-Tag schreiben"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3895,20 +4000,20 @@ 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:846
+#: src/prefs.c:878
 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:878
+#: src/prefs.c:910
 msgid "Character Set for reading ID3 tags"
 msgstr "Zeichensatz zum Lesen von ID3-Tags"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr "Nicht-Standard:"
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3939,31 +4044,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:914
+#: src/prefs.c:947
 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:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Scanner zum Füllen der Tags - Zeichensatzkonvertierung"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Unterstrich '_' und '%20' durch ein Leerzeichen ' ' ersetzen"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Leerzeichen ' ' durch Unterstrich '_' ersetzen"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -3972,11 +4077,11 @@ msgstr ""
 "im Scanner nach Tags benutzt."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Scanner zum Umbenennen der Dateien - Zeichensatzkonvertierung"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -3985,19 +4090,19 @@ msgstr ""
 "im Scanner nach Dateinamen benutzt."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 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:1001
+#: src/prefs.c:1034
 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:1005
+#: src/prefs.c:1038
 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 "
@@ -4010,15 +4115,15 @@ msgstr ""
 "man 'Text in an Entry' statt 'Text In An Entry')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Scannerfenster"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Öffne das Scannerfenster beim Start"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4026,11 +4131,11 @@ msgstr ""
 "Aktiviere diese Option, um beim Start von EasyTAG automatisch das "
 "Scannerfenster zu öffnen."
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Scanner-Fenster immer im Vordergrund"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4038,16 +4143,16 @@ msgstr ""
 "Wenn aktiviert, wird das Maskenfenster immer über dem Hauptfenster liegen."
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "Felder"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Felder werden überschrieben, wenn ein Tag gescannt wird"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4055,11 +4160,11 @@ msgstr ""
 "Scanner ersetzt vorhandenen Text in Feldern mit neuem Inhalt, wenn "
 "aktiviert. Wenn nicht, werden nur leere Felder ausgefüllt."
 
-#: src/prefs.c:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "Standardmäßig diesen Text verwenden :"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4068,11 +4173,11 @@ msgstr ""
 "dieser Text in das Kommentarfeld eingetragen werden soll."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 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:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4083,42 +4188,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "CD-Datenbank"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 msgid "Server Settings for Automatic Search"
 msgstr "Servereinstellungen für automatische Suche"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "Name :"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "CGI-Pfad :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 msgid "Server Settings for Manual Search"
 msgstr "Server-Einstellungen für manuelle Suche"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 msgid "Local CD Data Base"
 msgstr "Lokale CD-Datenbank"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 msgid "Path :"
 msgstr "Pfad :"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4130,58 +4235,58 @@ msgstr ""
 "'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' und 'misc'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Proxy-Einstellungen"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Verwende Proxy"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Aktiviere die Einstellungen des Proxy-Servers."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "Rechnername :"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Name des Proxy-Servers."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Port des Proxy-Servers."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "Nutzername :"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "Nutzername für den Proxy-Server."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "Nutzer-Passwort :"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr "Passwort des Nutzers des Proxy-Servers."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "Stücknamensliste:"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 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:1320
+#: src/prefs.c:1353
 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."
@@ -4190,7 +4295,7 @@ msgstr ""
 "passende Datei in der Hauptliste ebenfalls ausgewählt."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4201,15 +4306,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Bestätigung"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Beenden des Programms bestätigen"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4217,53 +4322,57 @@ msgstr ""
 "Falls aktiviert, öffnet sich eine Dialogbox, um eine Bestätigung zu "
 "erfragen, bevor das Programm beendet wird."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "Schreiben des Tags bestätigen"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "Umbenennen der Datei bestätigen"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "Löschen der Datei bestätigen"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "Schreiben der Wiedergabeliste bestätigen"
 
-#: src/prefs.c:1389
+#. 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:1422
 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:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "Dieses Fenster schließen ohne abzuspeichern"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 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:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Beispiel: %.*d_-_Stück_Name_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "Änderungen angewandt"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "Konfiguration gespeichert"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "Konfiguration ist unverändert"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4274,11 +4383,11 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "Kein Verzeichnis"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Das Wiedergabeprogramm '%s' wurde nicht gefunden!"
@@ -4295,16 +4404,16 @@ msgstr "Datei und Verzeichnis umbenennen"
 msgid "Process Fields"
 msgstr "Felder verarbeiten"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "Tag wurde erfolgreich gescannt..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Tag wurde erfolgreich gescannt...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4312,23 +4421,23 @@ msgstr ""
 "Tag-Scanner: Seltsam..., die Erweiterung '%s' wurde nicht im Dateinamen '%s' "
 "gefunden!"
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Scan-Fehler: Separator '%s' in '%s' nicht auffindbar"
 
-#: src/scan.c:660
+#: src/scan.c:663
 #, 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:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "Neuer Dateinamen wurde erfolgreich gescannt..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Neuer Dateiname wurde erfolgreich gescannt...(%s)"
@@ -4336,41 +4445,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "Scan von Tag und Dateinamen"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Scanner :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "Typ des zu verwendenden Scanners auswählen"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Öffne Scanner-Fenster / Ausgewählte Dateien scannen"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Scanneroptionen"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Maskeneditor anzeigen/verstecken"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Legende anzeigen/verstecken"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4380,15 +4489,15 @@ msgstr ""
 "zum Ausfüllen der Tag-Felder verwendet."
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "Tag-Füllungs-Vorschau"
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr "Stelle aktuellen Pfad vor die Maske"
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4401,15 +4510,15 @@ msgstr ""
 "ist, ist es ein absoluter Pfad, ansonsten relativ zum alten Pfad."
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "Umbenennungs-Vorschau"
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Felder auswählen:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4419,126 +4528,126 @@ msgstr ""
 "Wählen sie die interessanten aus."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "Verarbeite Dateinamensfeld"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "Titelfeld verarbeiten"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Kü"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "Künstlerfeld dieser Datei bearbeiten"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Albumfeld verarbeiten"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "Verarbeite Genrefeld"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "K"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "Kommentarfeld verarbeiten"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "Ko"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Komponistenfeld verarbeiten"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 msgid "Process original artist field"
 msgstr "Originalkünstlerfeld dieser Datei bearbeiten"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Co"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Copyright-Feld verarbeiten"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "URL-Feld verarbeiten"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "K"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "Verarbeite Kodiererfeld"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Auswahl umkehren"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Alle/Keine auswählen."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "'_' und '%20' durch ' ' ersetzen"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Konvertiere :"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "nach : "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4548,7 +4657,7 @@ msgstr ""
 "(Beispiel, vorher: 'Text%20in%20einem_Eintrag', danach: 'Text in einem "
 "Eintrag')."
 
-#: src/scan.c:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4556,11 +4665,12 @@ msgstr ""
 "Ein Leerzeichen wird durch einen Unterstrich ersetzt. \n"
 "Beispiel, vorher: 'Text in einem Eintrag', danach: 'Text_in_einem_Eintrag'."
 
-#: src/scan.c:2171
-msgid "Replace a character by an other one."
-msgstr "Ersetze ein Zeichen durch ein anderes."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4568,7 +4678,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:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4576,7 +4686,7 @@ msgstr ""
 "Wörter in allen Feldern klein schreiben. \n"
 "Beispiel, vorher: 'TEXT IN einem eintrag', danach: 'text in einem eintrag'."
 
-#: src/scan.c:2209
+#: src/scan.c:2325
 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'."
@@ -4585,7 +4695,7 @@ msgstr ""
 "geschrieben. \n"
 " Beispiel, vorher: 'text IN Einem EINTRAG', danach: 'Text in einem eintrag'."
 
-#: src/scan.c:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4593,15 +4703,15 @@ 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:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Vor einem Großbuchstaben ein Leerzeichen einfügen"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "Doppelte Leerzeichen oder Unterstriche entfernen"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4609,7 +4719,7 @@ msgstr ""
 "Alle Leerzeichen zwischen Wörtern werden entfernt. \n"
 "Beispiel, vorher: 'Text In Einem Eintrag', danach: 'TextInEinemEintrag'."
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4617,7 +4727,7 @@ msgstr ""
 "Vor jedem Großbuchstaben wird ein Leerzeichen eingefügt. \n"
 "Beispiel, vorher: 'TextInEinemEintrag', danach: 'Text In Einem Eintrag'."
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4628,183 +4738,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "Legende"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : Künstler"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : Album"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : Kommentar"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p : Komponist"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r : Copyright"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : CD-Nummer"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : Kodierer"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : Genre"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : wird ignoriert"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : Anzahl von Stücken"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : Originalkünstler"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : Stück"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : Titel"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : Jahr"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Maskeneditor"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "Neue Maske erstellen"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Maske nach oben bewegen"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Maske nach unten bewegen"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Maske duplizieren"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Vorgabemasken hinzufügen"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "Maske löschen"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Masken speichern"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "Neue_Maske"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "Kopieren: keine Zeile ausgewählt!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "Löschen: keine Zeile ausgewählt!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Nach oben bewegen: keine Zeile ausgewählt!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Nach unten bewegen: keine Zeile ausgewählt!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "FEHLER: Konfigurationsdatei kann nicht geschrieben werden: %s (%s)"
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Konfigurationsdatei '%s' kann nicht geöffnet werden (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "Standardkonfiguration wird geladen..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Datei '%s' kann nicht geöffnet werden (%s)"
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, 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:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Vorgaben für 'Fülle Tag'-Masken werden geladen..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "Vorgabe für 'Datei umbenennen'-Masken werden geladen..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Vorgabe für 'Verzeichnis umbenennen'-Masken werden geladen..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ERROR: Die Umgebungsvariable HOME ist nicht definiert!"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "FEHLER: Kann Verzeichnis '%s' nicht anlegen! (%s)"
@@ -4889,6 +4999,34 @@ msgstr "Audio-Player: '%s'"
 msgid "EasyTAG settings dir: '%s'"
 msgstr "Verzeichnis für EasyTAG-Einstellungen: '%s'"
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Der eingegebene Pfad ist ungültig!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Groß/Kleinschreibung beachten"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Ersetze ein Zeichen durch ein anderes."
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Geladener Dateiinhalt :"
+
+#~ msgid "Files Name List :"
+#~ msgstr "Dateinamensliste :"
+
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(MP3-Unterstützung aktiviert, verwendet: libid3tag %s)"
+
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(ID3v2.3-Tag-Unterstützung aktiviert, verwendet: id3lib %d.%d.%d)"
+
 #, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "Ungültige Tag-Version"
@@ -5026,8 +5164,8 @@ msgstr "Verzeichnis für EasyTAG-Einstellungen: '%s'"
 #~ "Die Zeichensatz-Übersetzung von '%s'\n"
 #~ "nach '%s' wird nicht unterstützt."
 
-#~ msgid "ERROR while opening file: '%s' (%s)"
-#~ msgstr "FEHLER beim Öffnen der Datei: '%s' (%s)."
+#~ msgid "ERROR while opening file: '%s' (%s)\a"
+#~ msgstr "FEHLER beim Öffnen der Datei: '%s' (%s).\a"
 
 #~ msgid "Load on startup the directory"
 #~ msgstr "Lade dieses Verzeichnis beim Start"
@@ -5268,9 +5406,6 @@ msgstr "Verzeichnis für EasyTAG-Einstellungen: '%s'"
 #~ msgid "Extra"
 #~ msgstr "Extra"
 
-#~ msgid "(Not available!)"
-#~ msgstr "(Nicht vorhanden!)"
-
 #~ msgid "Keep the tree browser in memory"
 #~ msgstr "Halte den Verzeichnisbaum im Speicher"
 
@@ -5395,9 +5530,6 @@ msgstr "Verzeichnis für EasyTAG-Einstellungen: '%s'"
 #~ msgid "Dotted"
 #~ msgstr "Gepunktet"
 
-#~ msgid "Tabbed"
-#~ msgstr "Gerahmt"
-
 #~ msgid "Select the style of the line in the browser tree."
 #~ msgstr "Wähle den Zeilenstil im Auswahl-Baum"
 
@@ -5487,9 +5619,6 @@ msgstr "Verzeichnis für EasyTAG-Einstellungen: '%s'"
 #~ msgid "/Misc/_Open Scanner Window"
 #~ msgstr "/Extra/_Scannerfenster öffnen"
 
-#~ msgid "No path selected!"
-#~ msgstr "Kein Pfad ausgewählt!"
-
 #~ msgid "Commands"
 #~ msgstr "Befehle"
 
diff --git a/po/easytag.pot b/po/easytag.pot
index b23c9b8..ec93d77 100644
--- a/po/easytag.pot
+++ b/po/easytag.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,191 +16,227 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
 "GTK+ interface makes tagging easier under GNU/Linux."
 msgstr ""
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr ""
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr ""
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr ""
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr ""
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr ""
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr ""
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr ""
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr ""
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr ""
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr ""
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr ""
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr ""
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr ""
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr ""
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr ""
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr ""
 
-#: src/about.c:160
+#: src/about.c:171
 msgid "(Chinese translation)"
 msgstr ""
 
-#: src/about.c:161
+#: src/about.c:172
 msgid "(Hebrew translation)"
 msgstr ""
 
+#: src/about.c:173
+msgid "(Serbian translation)"
+msgstr ""
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr ""
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr ""
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr ""
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr ""
 
-#: src/about.c:276
+#: src/about.c:297
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr ""
 
-#: src/about.c:283
+#: src/about.c:305
 #, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
+msgid "Author: %s"
 msgstr ""
 
-#: src/about.c:287
+#: src/about.c:309 src/easytag.c:212
 #, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+msgid "E-mail: %s"
 msgstr ""
 
-#: src/about.c:292
-msgid "(ID3v2.3 tags  support disabled)"
+#: src/about.c:315
+msgid "Web Page: "
 msgstr ""
 
-#: src/about.c:296
-#, c-format
-msgid "(MP3 file support disabled)"
+#: src/about.c:328
+msgid "Description:"
 msgstr ""
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
 msgstr ""
 
-#: src/about.c:307
-msgid "(Speex file support disabled)"
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
 msgstr ""
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:394
+msgid "MP3 file support"
 msgstr ""
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
 msgstr ""
 
-#: src/about.c:322
-msgid "(WavPack file support disabled)"
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
 msgstr ""
 
-#: src/about.c:330
+#: src/about.c:404
 #, c-format
-msgid "Author: %s"
+msgid "id3lib %d.%d.%d"
 msgstr ""
 
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
+#: src/about.c:408
+msgid "ID3v2.3 tags writting support"
 msgstr ""
 
-#: src/about.c:340
-msgid "Web Page: "
+#: src/about.c:410
+msgid "available"
 msgstr ""
 
-#: src/about.c:352
-msgid "Description:"
+#: src/about.c:420
+msgid "Ogg Vorbis file support"
+msgstr ""
+
+#: src/about.c:430
+msgid "Speex file support"
+msgstr ""
+
+#: src/about.c:440
+msgid "FLAC file support"
+msgstr ""
+
+#: src/about.c:450
+msgid "MP4/AAC file support"
+msgstr ""
+
+#: src/about.c:460
+msgid "WavPack file support"
 msgstr ""
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr ""
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr ""
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr ""
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr ""
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -533,7 +569,7 @@ msgstr ""
 msgid "Reload Directory"
 msgstr ""
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr ""
 
@@ -678,7 +714,7 @@ msgstr ""
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr ""
 
@@ -688,103 +724,95 @@ msgid ""
 "Do you want to save them before changing the directory?"
 msgstr ""
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr ""
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 msgid "<All albums>"
 msgstr ""
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
 
-#: src/browser.c:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr ""
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr ""
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr ""
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr ""
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr ""
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr ""
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr ""
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr ""
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr ""
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr ""
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 
-#: src/browser.c:3236
+#: src/browser.c:3263
 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:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr ""
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr ""
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr ""
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr ""
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -811,14 +839,14 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
 "(%s)"
 msgstr ""
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -828,47 +856,47 @@ msgid ""
 "(%s)"
 msgstr ""
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr ""
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr ""
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 
-#: src/browser.c:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr ""
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 
-#: src/browser.c:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr ""
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr ""
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr ""
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr ""
@@ -952,7 +980,7 @@ msgstr ""
 msgid "All Fields"
 msgstr ""
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr ""
 
@@ -1027,7 +1055,7 @@ msgstr ""
 msgid "Results :"
 msgstr ""
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr ""
 
@@ -1055,7 +1083,7 @@ msgstr ""
 msgid "Invert lines selection"
 msgstr ""
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr ""
 
@@ -1077,15 +1105,15 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr ""
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr ""
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr ""
 
@@ -1097,12 +1125,12 @@ msgstr ""
 msgid "# Tracks"
 msgstr ""
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr ""
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr ""
 
@@ -1114,7 +1142,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1127,86 +1155,86 @@ msgstr ""
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 
-#: src/cddb.c:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr ""
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
 
-#: src/cddb.c:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr ""
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr ""
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr ""
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr ""
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr ""
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr ""
 
 #. Open connection to the server
-#: src/cddb.c:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr ""
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr ""
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr ""
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr ""
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr ""
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr ""
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr ""
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr ""
@@ -1215,89 +1243,89 @@ msgstr ""
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr ""
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 msgid "The server returned a wrong answer!"
 msgstr ""
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr ""
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr ""
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr ""
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr ""
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr ""
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr ""
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 msgid "Local CD search..."
 msgstr ""
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr ""
 
-#: src/cddb.c:3231
+#: src/cddb.c:3268
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr ""
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr ""
 
 #. Load the track list of the album
-#: src/cddb.c:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr ""
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1306,7 +1334,7 @@ msgid ""
 "Do you want to continue ?"
 msgstr ""
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr ""
 
@@ -1578,11 +1606,11 @@ msgstr ""
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr ""
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr ""
 
@@ -1590,7 +1618,7 @@ msgstr ""
 msgid "Bitrate:"
 msgstr ""
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr ""
 
@@ -1598,17 +1626,17 @@ msgstr ""
 msgid "Freq:"
 msgstr ""
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr ""
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr ""
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr ""
 
@@ -1787,11 +1815,11 @@ msgid "Tag selected files with these pictures"
 msgstr ""
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
+msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr ""
 
 #: src/easytag.c:1051
-msgid "Add pictures to the tag (drag and drop is also available)."
+msgid "Remove selected pictures, else all pictures."
 msgstr ""
 
 #: src/easytag.c:1061
@@ -2129,7 +2157,7 @@ msgstr ""
 msgid "File '%s' deleted"
 msgstr ""
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2138,120 +2166,121 @@ msgid ""
 msgstr ""
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr ""
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr ""
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr ""
 
-#: src/easytag.c:3235
+#: src/easytag.c:3239
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr ""
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr ""
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr ""
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr ""
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr ""
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr ""
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr ""
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr ""
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr ""
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr ""
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr ""
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr ""
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr ""
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr ""
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr ""
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 msgid "Remove duplicate spaces or underscores"
 msgstr ""
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr ""
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr ""
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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@gmail.com"
 msgstr ""
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr ""
 
-#: src/easytag.c:4466
+#: src/easytag.c:4479
+#, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2264,23 +2293,22 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr ""
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
 msgstr ""
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr ""
 
@@ -2373,7 +2401,7 @@ msgid ""
 "(Try setting the environment variable G_FILENAME_ENCODING)."
 msgstr ""
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr ""
 
@@ -2532,304 +2560,332 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr ""
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr ""
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr ""
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr ""
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr ""
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr ""
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr ""
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr ""
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr ""
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr ""
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr ""
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr ""
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr ""
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr ""
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "Warning..."
 msgstr ""
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr ""
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr ""
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr ""
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr ""
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr ""
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr ""
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr ""
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr ""
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr ""
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr ""
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr ""
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr ""
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 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:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr ""
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 msgid "Use relative path for files in playlist"
 msgstr ""
 
 #. Create playlist in parent directory
-#: src/misc.c:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr ""
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 
 #. DOS Separator
-#: src/misc.c:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr ""
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr ""
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr ""
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr ""
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr ""
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
 "Overwrite?"
 msgstr ""
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr ""
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
 "(%s)"
 msgstr ""
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr ""
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr ""
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr ""
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr ""
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr ""
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr ""
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr ""
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr ""
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr ""
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr ""
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr ""
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr ""
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr ""
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr ""
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr ""
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 msgid "File :"
 msgstr ""
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr ""
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
+#: src/misc.c:2810
+msgid "Content of TXT file"
 msgstr ""
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+msgid "Insert a blank line before the selected line"
 msgstr ""
 
-#: src/misc.c:2828
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+msgid "Delete the selected line"
+msgstr ""
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr ""
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+msgid "Move up the selected line"
+msgstr ""
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+msgid "Move down the selected line"
+msgstr ""
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr ""
+
+#: src/misc.c:2903
+msgid "List of files"
+msgstr ""
+
+#: src/misc.c:2998
+msgid "Selected line:"
+msgstr ""
+
+#: src/misc.c:3016
 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:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr ""
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr ""
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
+#: src/misc.c:3424
+msgid "Move up this line"
 msgstr ""
 
-#: src/misc.c:3233
-msgid "Reload"
+#: src/misc.c:3430
+msgid "Move down this line"
 msgstr ""
 
 #. Mode changed to profile name
@@ -2962,121 +3018,121 @@ msgstr ""
 msgid "Save file..."
 msgstr ""
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr ""
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr ""
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr ""
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr ""
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr ""
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr ""
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr ""
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr ""
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr ""
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr ""
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr ""
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr ""
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr ""
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr ""
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr ""
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr ""
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr ""
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr ""
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr ""
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr ""
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr ""
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr ""
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr ""
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr ""
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr ""
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr ""
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
 msgstr ""
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr ""
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3084,7 +3140,7 @@ msgid ""
 "(%s)"
 msgstr ""
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr ""
 
@@ -3323,23 +3379,47 @@ msgid ""
 "the program (as 'xmms -p') before to receive files as other arguments."
 msgstr ""
 
+#. Log options
+#: src/prefs.c:411
+msgid "Log Options"
+msgstr ""
+
+#. Show / hide log view
+#: src/prefs.c:418
+msgid "Show log view in main window"
+msgstr ""
+
+#: src/prefs.c:421
+msgid "If activated, the log view would be visible in the main window."
+msgstr ""
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr ""
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr ""
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr ""
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3348,52 +3428,52 @@ msgid ""
 msgstr ""
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr ""
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr ""
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr ""
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr ""
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr ""
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr ""
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr ""
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr ""
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3404,47 +3484,47 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr ""
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
 msgstr ""
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr ""
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "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 ""
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
 "looking characters."
 msgstr ""
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3453,42 +3533,42 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr ""
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr ""
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr ""
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
 "1996, 95 => 1995, ...)."
 msgstr ""
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr ""
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
 "'10',...). Else it keeps the 'raw' track value."
 msgstr ""
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr ""
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3497,17 +3577,17 @@ msgid ""
 "shown in XMMS, though."
 msgstr ""
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr ""
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr ""
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr ""
 
@@ -3515,32 +3595,32 @@ msgstr ""
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr ""
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr ""
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr ""
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
 msgstr ""
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr ""
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3549,61 +3629,61 @@ msgid ""
 msgstr ""
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr ""
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
 msgstr ""
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr ""
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 msgid "Character Set for writing ID3 tags"
 msgstr ""
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 msgid "ID3v2 tags"
 msgstr ""
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr ""
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 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:716
+#: src/prefs.c:748
 msgid "Version:"
 msgstr ""
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3612,71 +3692,71 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 msgid "Unicode "
 msgstr ""
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 msgid "Unicode type to use"
 msgstr ""
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 msgid "Character set used to write the tag data in the file."
 msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 msgid "No"
 msgstr ""
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 msgid "ID3v1 tags"
 msgstr ""
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr ""
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 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:846
+#: src/prefs.c:878
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
 
 #. Character Set for reading tag
-#: src/prefs.c:878
+#: src/prefs.c:910
 msgid "Character Set for reading ID3 tags"
 msgstr ""
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3693,59 +3773,59 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:914
+#: src/prefs.c:947
 msgid "Character set used to read tag data in the file."
 msgstr ""
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr ""
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr ""
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr ""
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr ""
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 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:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr ""
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 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:994
+#: src/prefs.c:1027
 msgid "Process Fields Scanner - Character Conversion"
 msgstr ""
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1001
+#: src/prefs.c:1034
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1005
+#: src/prefs.c:1038
 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 "
@@ -3754,62 +3834,62 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr ""
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr ""
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr ""
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr ""
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
 msgstr ""
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr ""
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr ""
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr ""
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 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:1072
+#: src/prefs.c:1105
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 
-#: src/prefs.c:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -3818,42 +3898,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr ""
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 msgid "Server Settings for Automatic Search"
 msgstr ""
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr ""
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr ""
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr ""
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 msgid "Server Settings for Manual Search"
 msgstr ""
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 msgid "Local CD Data Base"
 msgstr ""
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 msgid "Path :"
 msgstr ""
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -3862,65 +3942,65 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr ""
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr ""
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr ""
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr ""
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr ""
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr ""
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr ""
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr ""
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr ""
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr ""
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr ""
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -3929,67 +4009,71 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr ""
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr ""
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr ""
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr ""
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr ""
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr ""
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr ""
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr ""
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr ""
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 msgid "Save changes and close this window"
 msgstr ""
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr ""
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr ""
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr ""
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -3997,11 +4081,11 @@ msgid ""
 "(%s) "
 msgstr ""
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr ""
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
@@ -4018,36 +4102,36 @@ msgstr ""
 msgid "Process Fields"
 msgstr ""
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr ""
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr ""
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr ""
 
-#: src/scan.c:660
+#: src/scan.c:663
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 
-#: src/scan.c:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr ""
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr ""
@@ -4055,56 +4139,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr ""
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr ""
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr ""
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr ""
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr ""
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr ""
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr ""
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr ""
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 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:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr ""
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4113,201 +4197,202 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr ""
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr ""
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 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:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr ""
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr ""
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr ""
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr ""
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr ""
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr ""
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr ""
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr ""
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 msgid "Process original artist field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr ""
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr ""
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr ""
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr ""
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr ""
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr ""
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr ""
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr ""
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr ""
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 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:2169
+#: src/scan.c:2284
 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:2171
-msgid "Replace a character by an other one."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 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:2206
+#: src/scan.c:2322
 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:2209
+#: src/scan.c:2325
 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:2212
+#: src/scan.c:2328
 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:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr ""
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr ""
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4316,183 +4401,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr ""
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr ""
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr ""
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr ""
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr ""
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr ""
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr ""
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr ""
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr ""
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr ""
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr ""
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr ""
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr ""
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr ""
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr ""
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr ""
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr ""
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr ""
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr ""
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr ""
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr ""
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr ""
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr ""
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr ""
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr ""
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr ""
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr ""
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr ""
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr ""
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr ""
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr ""
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr ""
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
 
 #. Fall back to defaults
-#: src/setting.c:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr ""
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr ""
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr ""
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr ""
diff --git a/po/el.gmo b/po/el.gmo
index 1e9813c..26faa15 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index 30ca35d..831bf0c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 1.99.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2005-12-26 16:40+0200\n"
 "Last-Translator: Apollon Oikonomopoulos <apoikos@mail.ntua.gr>\n"
 "Language-Team: Modern Greek <el@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.11\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
@@ -31,189 +31,231 @@ msgstr ""
 "Monkey's Audio. �� ���� ��� ������ ���������� ��� ����� ��� ����������� ��� "
 "�������� ��� GNU/Linux ��������!"
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(��������� ���������)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(������ ���������)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(��������� ���������)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(������� ���������)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(��������� ���������)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(������� ���������)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(��������� ���������)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(������������ ���������)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(���������� ���������)"
 
-#: src/about.c:160
+#: src/about.c:171
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:161
+#: src/about.c:172
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(�������� ���������)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(��������� ���������)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "������"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "����..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "����"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(�������������: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(������������: GTK+ %d.%d.%d ��� id3lib %d.%d.%d)"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(����� ���������� ������� MP3)"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "����������: %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(����� ���������� ������� MP3)"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "E-mail: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "����������:"
 
-#: src/about.c:292
+#: src/about.c:328
+msgid "Description:"
+msgstr "���������:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "(����� ���������� ������� MP3)"
 
-#: src/about.c:296
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
 #, c-format
-msgid "(MP3 file support disabled)"
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
 msgstr "(����� ���������� ������� MP3)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "��� ������� ��������� �����"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(����� ���������� ������� Ogg Vorbis)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(����� ���������� ������� MP3)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(����� ���������� ������� FLAC)"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
 msgstr "(����� ���������� ������� MP4/AAC)"
 
-#: src/about.c:322
+#: src/about.c:460
 #, fuzzy
-msgid "(WavPack file support disabled)"
+msgid "WavPack file support"
 msgstr "(����� ���������� ������� MP3)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "����������: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-mail: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "����������:"
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "���������:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "�����������"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "�����������:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "������:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "�������� �������"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -546,7 +588,7 @@ msgstr "����������� ���������..."
 msgid "Reload Directory"
 msgstr "������������ ���������"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "������� ��������� ��..."
 
@@ -691,7 +733,7 @@ msgstr "���������� ��� ������ �������� ��� �� ������"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "�����������..."
 
@@ -703,89 +745,68 @@ msgstr ""
 "�������� ������ ����� ������������ ����� �� ������������ �� �������...\n"
 "������ �� �� ������������ ������ ������������� ��� ��������;"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"� �������� ����� ����������!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "������..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 #, fuzzy
 msgid "<All albums>"
 msgstr "# ������"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "������ ���� ��� ��������� ��� %s: �� ������� ������ %s ��� ������."
 
-#: src/browser.c:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "�����������"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# ������"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# �������"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "������"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "�������� ��� ������ ��������"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "����� �� �������� ��� ��������� ���� ����� ������ �� ������������"
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "������"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "���������� & ������"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "����������� ��� ���������"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "����������� ��� ��������� '%s' ��:"
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "�����:"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 "�� ������������� � ������� ����, ���� �� ������ �� ��������������� ��� �� "
 "����������� ��� ���������."
 
-#: src/browser.c:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -793,21 +814,31 @@ msgstr ""
 "�������� � �������������� ��� ����� ��������������� ���� �������� (��. "
 "��������) ��� �� ������������ � ��������� ����� ��� ������ ��� ��������."
 
-#: src/browser.c:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "���������� ����� �������"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "������������� ���������������������."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "������..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "������ �� ��������������� ��� ����� ���������!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -836,7 +867,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -845,7 +876,7 @@ msgstr ""
 "������� ��� ��������� �� ���� �� �����!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -860,51 +891,51 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "� ��������� �������������"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "��������� ���� ��������:"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "�������������� �� ����� ��� ���� �������� ������������. �� ����� �� ����� "
 "��� ��������� ��������� �� ���������."
 
-#: src/browser.c:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "������� ������� ��..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "�������������� �� ����� ��� ���� �������� ������������. �� ����� �� ����� "
 "��� ��������� ������� �� ���������."
 
-#: src/browser.c:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "������ �� ��������������� ��� ����� ������������!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "� �������� '%s' �� �������!"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "��� ����� ������ � �������� ��� %s (������ %d)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "�������� ����������� ���� ���������� (forking)!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "����������� � ������: '%s %s'"
@@ -994,7 +1025,7 @@ msgstr "��������� ��:"
 msgid "All Fields"
 msgstr "��� �� �����"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "����"
 
@@ -1069,7 +1100,7 @@ msgstr " ����������"
 msgid "Results :"
 msgstr "������������:"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "���������:"
 
@@ -1098,7 +1129,7 @@ msgstr "���������� ���� ��� �������"
 msgid "Invert lines selection"
 msgstr "���������� ��������"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "������� ���� ��� �������"
 
@@ -1124,15 +1155,15 @@ msgstr "����� ���� ����������:"
 msgid "All"
 msgstr "���"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "����� �������"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "�����"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "������"
 
@@ -1144,12 +1175,12 @@ msgstr "�/� ���������"
 msgid "# Tracks"
 msgstr "��. ���������"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "�����"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "������ ���� ������� �� ��� ��������� ��������� �������"
 
@@ -1161,7 +1192,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1181,11 +1212,11 @@ msgstr ""
 "������� ��� ����������� � ���� ��� ������� (�� ��� ���� �������� ������ "
 "������)."
 
-#: src/cddb.c:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "������ ��� ���������..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1193,76 +1224,76 @@ msgstr ""
 "������: '%s', �����������: '%s', ��������: '%s', ������: '%s', �����: '%s', "
 "ID: '%s'"
 
-#: src/cddb.c:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "���������� ��������"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "���������� ���� ������� ������ ���������"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "���������� ���� ����� ���������"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "��������� ����������  '%s'..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "� ����������� '%s' (%s) �� �������!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "�������� ����������� ���� socket (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "������� �� ��� ���������� '%s', ���� '%d' ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "�������� �������� �� ��� ����������  '%s' (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "�������� ������� �� ��� ���������� '%s'."
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "���� ��������� (%s)..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "������ ���� ��� �������� ��� �������� ID3v1 ��� '%s' (%s)\n"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "�������� ����������� � ���������� ��� ������� '%s' (%s)\n"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "�������� ���������� ��� ������� '%s' (%s)"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "�������� �������..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "�������� ��������� ������� (%s)!"
@@ -1271,93 +1302,93 @@ msgstr "�������� ��������� ������� (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "���� ���������..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "� ������������ ����� ���������� ��������! (%s)"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "� ������������ ����� ���������� ��������! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr ""
 "��������, �� ������� ���������� ���� ��� ����� ����� ����� �����������!"
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "�������� %d ������/������ ��� ���������� ��� �������� ����������"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "���� ��������� (%s)..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "���� ��������� (%s)..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "����������� %d ������!"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 #, fuzzy
 msgid "Local CD search..."
 msgstr "������ ��� ���������..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr ""
 "�������� ������� (CddbId: %s, # ���������: %d, : �������� ������:%d) ..."
 
-#: src/cddb.c:3231
+#: src/cddb.c:3268
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "�������� %d ������/������ ��� ���������� ��� �������� ����������"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "�������� ���������� ��� ������� '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "������� ������ ��������� ������"
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1370,7 +1401,7 @@ msgstr ""
 "\n"
 "������ �� ����������;"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "���������� �������� ��� �� CDDB..."
 
@@ -1648,11 +1679,11 @@ msgstr "��������� ��������� �������"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
@@ -1660,7 +1691,7 @@ msgstr "?, Layer ?"
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1668,17 +1699,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "���������:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "�����:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1871,15 +1902,15 @@ msgid "Tag selected files with these pictures"
 msgstr "����� ����� ��� ������� �� ��� �� ���������� ������"
 
 #: src/easytag.c:1045
+msgid "Add pictures to the tag (drag and drop is also available)."
+msgstr "�������� ������� ���� ������� (������ �� ����� ��� �� drag & drop)."
+
+#: src/easytag.c:1051
 msgid "Remove selected pictures, else all pictures."
 msgstr ""
 "�������� ��� ����������� �������, � ���� ��� ������� �� ��� ���� �������� "
 "�����."
 
-#: src/easytag.c:1051
-msgid "Add pictures to the tag (drag and drop is also available)."
-msgstr "�������� ������� ���� ������� (������ �� ����� ��� �� drag & drop)."
-
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "���������� ��� ����������� ������� ��� �����."
@@ -2263,7 +2294,7 @@ msgstr "�������� �������..."
 msgid "File '%s' deleted"
 msgstr "�� ������ '%s' ����������."
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2275,110 +2306,110 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "��������� �� �������..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "������: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "�������� %d ������ �� ����� ��� �������� ��� ���� ������������� ���"
 
-#: src/easytag.c:3235
+#: src/easytag.c:3239
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "�������� %d ������ �� ����� ��� ��������."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u ������/�"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 "�� ������� ������ ������ �� ����� ��� �������� ��� ���� ������������� ���!"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "�� ������� ������ ������ �� ����� ��� ��������!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "��������� �� �������..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr " ��������� ����������..."
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "�������� ���� �������� ��� ���������!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "���������� ����� ��� ������ ��� �������� ��� ����������� �������"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "��������� ��� '_' ��� ��� '%20' �� ����"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "��������� ��� ' ' �� '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "��� ��������"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "��� ����"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "����� ������ ��������"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "����� ������ ���� ����� ��������"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "�������� �����"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "�������� ����� ���� ��� ���� �������� ������"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 msgid "Remove duplicate spaces or underscores"
 msgstr "�������� ������ ����� � '_'"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: ���������� ������! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, fuzzy, c-format
-msgid "Received signal %s (%d)"
+msgid "Received signal %s (%d)\a"
 msgstr "������ �� ���� %s(%d)\n"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2389,12 +2420,12 @@ msgstr ""
 "core' ��� ��� �������� 'bt' ��� 'l') ��� ������� ��� ��� ����������� ��� "
 "����������� ��� <easytag@gmail.com>"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "������� ����"
 
-#: src/easytag.c:4466
-#, fuzzy
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2407,8 +2438,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2427,11 +2457,11 @@ msgstr ""
 "��������_���/������    ����� �������� ���������\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: �������� ������"
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2439,7 +2469,7 @@ msgstr ""
 "������ ������ ����� ������������ ����� �� ������������ �� �������...\n"
 "������ �� ������������ ��� ������� ��� ������ ������ ������� �� ���������;"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr "���������� ����� �� �������� ��� �� ���������;"
 
@@ -2537,7 +2567,7 @@ msgstr ""
 "���� ������������ ���������� ��� ����������\n"
 "(��������� �� ������ �� ��������� ������������� G_FILENAME_ENCODING)"
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "��������� �������� �������"
 
@@ -2571,7 +2601,7 @@ msgstr "�������:"
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "������ ���� �� ������� ��� �������:  '%s' (%s).\n"
-""
+"\a"
 
 #: src/flac_tag.c:983 src/ogg_tag.c:752
 #, c-format
@@ -2702,123 +2732,123 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "��������� ������..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr "��"
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr "���"
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr "���"
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr "��������"
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr "����������"
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr "�����"
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr "��������"
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr "����������"
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr "��������"
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr "���������"
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr "���������..."
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "�������� ��������..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "�������� ������..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 #, fuzzy
 msgid "Warning..."
 msgstr "��������� �� �������..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "��� ����� ������ � �������� ��� %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "���������� ������ ������������"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "����� ������ ������������ M3U"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "����� ���������:"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "����������� ������"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "�������� ������ ������������"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "�� ������������ ���� �� ���������� ������"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2827,31 +2857,31 @@ msgstr ""
 "����������� ��� ����� ������������. �������� � ����� �� ������������ ��� �� "
 "������."
 
-#: src/misc.c:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "����� ������� ��������� ��� �� ������ ��� ����� ������������"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 msgid "Use relative path for files in playlist"
 msgstr "����� �������� ��������� ��� �� ������ ��� ����� ������������"
 
 #. Create playlist in parent directory
-#: src/misc.c:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "���������� ������ ������������ ��� ������ ��������"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "�� ������������� � ������� ����, ���� � ����� ������������ �� ������������ "
 "���� ������ ��������."
 
 #. DOS Separator
-#: src/misc.c:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "����� ������������� ��������� DOS"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2859,23 +2889,23 @@ msgstr ""
 "� ������� ���� ����������� �� ������������ ��������� ��� UNIX, '/' �� �� "
 "������������ ��� DOS, '\\'."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "����������� ������ ������������"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "���������� ���� ��� ������ ��� �������"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "���������� ����������� �� ����� ��� �������� �������"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "���������� ����������� �� �����:"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2884,12 +2914,12 @@ msgstr ""
 "�� ������ ������ ������������ '%s' ������� ���!\n"
 " �� ��������������;"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "���������� ������ ������������..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2898,48 +2928,44 @@ msgstr ""
 "�������� ����������� ��� ������ ������������ '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "������������ � ����� ������������ '%s'"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "������ ���������"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "������"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "��������"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "������� �����������"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "����������"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "�������������� ���"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "��������� �� ��� ������"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2947,54 +2973,93 @@ msgstr ""
 "����������� ��� �� ������."
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "��:"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "� ������� ..."
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "��������� �����/���������"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "��������: %d ������/�"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "������� �������� ������� ��� ��� ������ ��������"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 msgid "File :"
 msgstr "������:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr "�������"
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "����������� ���������� �������:"
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "����������� ������������ ��� �������"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "�������� ���� ����� ���� ��� ���� �������� ������"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "�������� ����� ��� �������"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "����� �������� �������:"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "�������� ���� ��� ����� �������"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "�� ������������ ���� �� ���������� ������"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "�� ������������ ���� �� ���������� ������"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "������������"
 
-#: src/misc.c:2828
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "���������� ���� ��� ������ ��� �������"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "������� ���� ��� �������"
+
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3003,21 +3068,23 @@ msgstr ""
 "�������������� � ������� �� ��� ��������� ��������� ��� (�� �������� ��� "
 "������ ������ �� ����� �������)."
 
-#: src/misc.c:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "�������� ���� ����� �������"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "�������� ����� ��� �������"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "�������� ���� ��� ����� �������"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "���������� ��� ������ ���� �� ����"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "������������"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "���������� ��� ������ ���� �� ����"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3151,111 +3218,111 @@ msgstr ""
 msgid "Save file..."
 msgstr "���������� �������..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "������ JPEG"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "������ PNG"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "�������� ����� �������"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "��������� PNG 32x32 pixel"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "���� ��������� �������"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "��������"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "�����������"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "������ �������"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "������ ����� (�.�. ������� CD)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "������ �����������/������ ����������/������"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "�����������/����������"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "���������� ���������"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "��������"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "������"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "����� �����������"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "���� ��� ����������"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "���� ��� ��������"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "���� ��� ������ / ������"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "��� ��������� ����"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "������"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "�������� �������������/����������"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "�������� ������������� ��������/��������"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "�������� ����� �������"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "pixels"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "�����"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "���������"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3263,11 +3330,11 @@ msgstr ""
 "��� ����� ������ � ���������� ��� �������, ����� �� ����������� ������ "
 "�������� ��� �� �������� ������ � ���������� ��� buffer ��� �������."
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "������� ������� �������..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3278,7 +3345,7 @@ msgstr ""
 "'%s'!\n"
 " (%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "�� ������ ������� �� ���������..."
 
@@ -3539,25 +3606,54 @@ msgstr ""
 "�������. �������� �� ������ ��� �������� ��� �� ���������, ���� �� ������ �� "
 "������� ������� ��� �������� (�.�. 'xmms -p')."
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "�������� ��������"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "������ ��� ������ ���������"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr ""
+"�� ������������� � ������� ����, ���� � ����� ������������ �� ������������ "
+"���� ������ ��������."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "��������� �������"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "�������� �������"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr ""
 "������������� ����������� ���������� ��� ����� ��� ������� (��� ����� ��� "
 "Windows ��� �� CD-ROM)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3571,40 +3667,40 @@ msgstr ""
 "��� ������."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "��������� ��� ��������� ��� �������� ������� �� :"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "����"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "�.�. � �������� �� ���������� �� '.mp3'"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "��������"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "�.�. � �������� �� ���������� �� '.MP3'"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "����� ������"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "� �������� �� �� ����������"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "��������� ��� ������ ������������ ��� �������"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
@@ -3612,13 +3708,13 @@ msgstr ""
 "���� ��� ���������� ��� ������� �� ����."
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3629,12 +3725,12 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr "������ ���������� ��� �� ������� �������"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
@@ -3643,11 +3739,11 @@ msgstr ""
 "��� �������� ������� ��� �������� ���� ������������ ���������� ��� "
 "����������."
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "������ ���� ����� ������������� ����������"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
@@ -3658,14 +3754,14 @@ msgstr ""
 "ISO-8859-2 ��� 'hr'). �� � ��������� ��������, ���� �� easytag �� ��������� "
 "��� ������������ ISO-8859-1."
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 "����� ���������� ��� ������������� ���������� ��� ���������� ��� "
 "������������ ��� ���������� ����������."
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3676,7 +3772,7 @@ msgstr ""
 "������ ����, ���� �� �������������� �� ���� � ������������� ������� ���� "
 "�������� ����������."
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
@@ -3684,7 +3780,7 @@ msgstr ""
 "����� ���������� ��� ������������� ���������� ��� ���������� ��� ������� "
 "�������� ������� ����������."
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3695,20 +3791,20 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "��������� ��������"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "�������� ��������"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "�������� ���������� ��� �����������, �� ��� ����� ������"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3718,11 +3814,11 @@ msgstr ""
 "������� (�.�. � �������� ������ ����� 2005: 5 => 2005, 4 => 2004, 6 => 1996, "
 "95 => 1995, ...)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "������� ��� ������� ������� ��� ��������� �� ���� �����:"
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3732,11 +3828,11 @@ msgstr ""
 "���� �� ���� ����� 'n' ����� (�.�. �� ��� �����: '05', '09', '10',...). "
 "����������� �������� ���� �� ��� ���������� ������ ������."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "������ Ogg Vorbis : ������� ��� ������� ��� ��� ����� XMMS."
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3751,7 +3847,7 @@ msgstr ""
 "��� ������ ���� �������� ������ ��� ������. ������ �� ������ �� �� "
 "������������ ��� XMMS."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
@@ -3759,11 +3855,11 @@ msgstr ""
 "���������� ��� ������� ��� ����� ��� �������� ���� �� �������� ��� ��� "
 "������ �� ��� ���� �� �� ������� Page Up/Page Down."
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr "��������� ��� ������� ��� ���� ����� ��� ��������."
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr ""
 "�������� ��� ������� ��� ����� ����� ��� �������� (���. �� ����� '������')"
@@ -3772,22 +3868,22 @@ msgstr ""
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "��������� �������� ID3"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "������� ����������� �������� ID3"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 #, fuzzy
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "�������� �������� ID3 ��� ������ FLAC ��� ������ �������� FLAC"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3797,11 +3893,11 @@ msgstr ""
 "����������� �� �������� ID3 �� ��������������."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "�������� ��� �������� �� ��� �� ����� ����� ����"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3814,11 +3910,11 @@ msgstr ""
 "��� �������, �� ��������� ��� ��� �� 7 ������ ����� ����� �����."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "�������� ��������� ��� ������� �������� �������� ID3v2"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3827,42 +3923,42 @@ msgstr ""
 "�������������� �� ID3v2.3."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 #, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "���������� �������� ID3v2"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "������ ���������� ��� ��� �������� ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "���������� �������� ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "���������� �������� ID3v2"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3873,12 +3969,12 @@ msgstr ""
 "�� ����������."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 #, fuzzy
 msgid "Version:"
 msgstr "���������:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3887,56 +3983,56 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "�������������� ���"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 msgid "Character set used to write the tag data in the file."
 msgstr "������ ���������� �� �� ����� �� ������������ � ������� ��� ������."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 #, fuzzy
 msgid "No"
 msgstr "���"
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "������� ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "���������� �������� ID3v1.x"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3945,22 +4041,22 @@ msgstr ""
 "ID3v1, �, ������ ���� �������, �� �����������. ����������� � ������� ID3v1 "
 "�� ����������."
 
-#: src/prefs.c:846
+#: src/prefs.c:878
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "������ ���������� �� �� ����� �� ������������ � ������� ��� ������."
 
 #. Character Set for reading tag
-#: src/prefs.c:878
+#: src/prefs.c:910
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "������ ���������� ��� ��� �������� ID3"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3993,7 +4089,7 @@ msgstr ""
 "��� �������� ��� ��������� ��� �������� �� Windows � ISO-8859-7 ��� �������� "
 "��� ��������� ��� �������� �� Unix."
 
-#: src/prefs.c:914
+#: src/prefs.c:947
 msgid "Character set used to read tag data in the file."
 msgstr ""
 "������ ���������� �� �� ����� �� ������� � �������� ��� �������� ��� �� "
@@ -4002,24 +4098,24 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "�������"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "���������� �������� - ��������� ����������"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "��������� ��� '_' ��� ��� '%20' �� ���� ' '"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "��������� ��� ����� ' ' �� '_'"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4028,11 +4124,11 @@ msgstr ""
 "���� ������ ��� ������ ��������."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "����������� ������� - ��������� ����������"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4041,17 +4137,17 @@ msgstr ""
 "���� ������ ��� ������ ������������ �������."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "����������� ������ - ��������� ����������"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1001
+#: src/prefs.c:1034
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "���� ����� ������ �� ������� ��������� ��� �����"
 
-#: src/prefs.c:1005
+#: src/prefs.c:1038
 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 "
@@ -4064,15 +4160,15 @@ msgstr ""
 "��� �����')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "�������� ������"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "������� ��� ��������� ������ ���� ��� ��������"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4080,11 +4176,11 @@ msgstr ""
 "������������� ��� ������� ���� ��� �� ������� �������� �� �������� ��� "
 "������ ���� ���� ��� ������ �� EasyTAG."
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "����� ����� �������� ������"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4093,16 +4189,16 @@ msgstr ""
 "����� ��������."
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "�����"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "������� ���� ��� �� ��������� �����"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4110,11 +4206,11 @@ msgstr ""
 "�� �������������, ���� � ������� �� ����������� �� ������� ��� ����� ��� ��� "
 "����� ������� �� ���. �� ���������������, ���� �� ������ ���� ��� ���� �����."
 
-#: src/prefs.c:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "���������� ������ ������� :"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4123,11 +4219,11 @@ msgstr ""
 "��� ����� ������� ���� �������������� �� ������ ��� ���������� ��� ��������."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "����� ��� CRC32 �� ������ ������ (��� ������ �� �������� ID3 ����)."
 
-#: src/prefs.c:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4139,46 +4235,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "���� ��������� CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "�������� ���������"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "����� :"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "���� :"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "�������� CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "��������� �����������"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "���� ��������� CD"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 #, fuzzy
 msgid "Path :"
 msgstr "�������� CGI :"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4187,52 +4283,52 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "��������� ������������� �������"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "����� ������������� �������"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "������������ ������ ���� ������������� �������."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "����� ������������� :"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "����� ��� ������������� �������"
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "���� �������� ��� ������������� �������"
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "����� ������ :"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "����� ������ ��� ����������� ��� ������������� �������"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "����������� ������ :"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr "����������� ������ ��� ����������� ��� ������������� �������"
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "����� ������ ���������"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4240,7 +4336,7 @@ msgstr ""
 "������� ��� ����������� ������� ���� (������� �� �� ���� � �� DLM, �� ���� "
 "����� ��������������)"
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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."
@@ -4250,7 +4346,7 @@ msgstr ""
 "�����."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4261,15 +4357,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "�������������"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "����������� ������ ��� �� ���������"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4277,54 +4373,58 @@ msgstr ""
 "�� �������������, ���� �� �������� ��� �� ������ ����������� ������ ��� �� "
 "���������."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "����������� ����������� ��� �������� ��� �������"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "����������� ������������ ��� �������"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "����������� ��������� ��� �������"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "����������� ����������� ��� ������ ������������"
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr ""
 "�������� ��� ������� (����� ���������� ����) ��� �������� ��� ���������"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "�������� ��� ��������� ����� �� ������������ �� �������"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 msgid "Save changes and close this window"
 msgstr "���������� ��� ������� ��� �������� ��� ���������"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(�.�.: %.*d_-_�����_�������_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "�� ������� ������� �� ����"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "�� ��������� �������������"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "�� ��������� ������� �����������"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4335,11 +4435,11 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "��� ����� ���������"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "�� ��������� ������������ ���� '%s' �� �������!"
@@ -4356,36 +4456,36 @@ msgstr "����������� ������� ��� ���������"
 msgid "Process Fields"
 msgstr "����������� ������"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "� ������� ������������ ��������..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "� ������� ������������ ��������...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "������ �������: �������� ���������� ��� ������������� '%s' ��� '%s'"
 
-#: src/scan.c:660
+#: src/scan.c:663
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "�������� ���������� ��� '%s' ��� ������ ���������� ��� ����������."
 
-#: src/scan.c:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "�� ������ ������������� �� ��������..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "�� ������ ������������� �� ��������...(%s)"
@@ -4393,41 +4493,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "������ �������� ��� �������� �������."
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "�������� :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "�������� ��� ���� ������ ��� ����������"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "������ ��� ����������� �������"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "�������� ������"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "�������� / �������� ��� �������� ������"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "�������� / �������� �����������"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "�������� ��� ��������� �����"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4437,15 +4537,15 @@ msgstr ""
 "��������������� ��� �� ���������� ��� ��������."
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "������������� ��������..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr "����� ��� ��������� ��������� �� ������� ��� �����"
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4460,15 +4560,15 @@ msgstr ""
 "��� ����������� ��������."
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "������������� �������� �������..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "�������� �����:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4477,126 +4577,126 @@ msgstr ""
 "���� ��� ��� �����������."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "�"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "����� �������"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "�"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "������ ���������"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "�"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "�����������"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "�"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "����� ������"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "�"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "������� �����"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "��"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "������"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "��"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "����� �������"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "��"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 msgid "Process original artist field"
 msgstr "����� ������� ����������"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "C"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Copyright"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "��"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "�������������� ���"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "���������� ��������"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "�������/���������� ����"
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "��������� ��� '_' ��� ��� '%20' �� ' '"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "��������� :"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "�� : "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4604,7 +4704,7 @@ msgstr ""
 "� ���� ����� ��� � ������������ '%20' ��������������� ��� ��� ����. �.�. �� "
 "'�������%20��%20�����������_�����' ������� '������� �� �����������_�����'."
 
-#: src/scan.c:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4612,11 +4712,12 @@ msgstr ""
 "�� ���� �������������� ��� ��� ���� �����. �.�. �� '������� �� ����������� "
 "�����' ������� '�������_��_�����������_�����'."
 
-#: src/scan.c:2171
-msgid "Replace a character by an other one."
-msgstr "������������� ���� ��������� �� ���� ����."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4624,7 +4725,7 @@ msgstr ""
 "��������� ���� ��� ��������� �� ��� �� ����� �� ��������. �.�. �� '������� "
 "�� ������ �����' ������� '������� �� ������ �����'."
 
-#: src/scan.c:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4632,7 +4733,7 @@ msgstr ""
 "��������� ���� ��� ��������� �� ��� �� ����� �� ����. �.�. �� '������� �� "
 "������ �����' ������� '������� �� ������ �����'."
 
-#: src/scan.c:2209
+#: src/scan.c:2325
 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'."
@@ -4640,7 +4741,7 @@ msgstr ""
 "��������� ��� ������� ��������� ��� ������ ����� ���� ������ �� ��������. �."
 "�. �� '������� �� ������ �����' ������� '������� �� ������ �����'."
 
-#: src/scan.c:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4648,15 +4749,15 @@ msgstr ""
 "��������� ��� ������� ��������� ���� ����� ���� ������ �� ��������. �.�. �� "
 "'������� �� ������ �����' ������� '������� �� ������ �����'."
 
-#: src/scan.c:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "�������� ���� ����� ���� ��� ���� �������� ������"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "�������� ������ ����� � ���� ������"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4664,7 +4765,7 @@ msgstr ""
 "����������� ��� �� ���� ������� ���� ������. �.�. �� '������� �� ������ "
 "�����' ������� '��������������������'."
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4672,7 +4773,7 @@ msgstr ""
 "��������� ��� ���� ���� ��� ���� �������� ���������. �.�. �� "
 "'��������������������' ������� '������� �� ������ �����'."
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4683,190 +4784,190 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "��������"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : ����� ����������"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : ������ ������"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : ������"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p : ����� �������"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r : Copyright"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : �/� ������"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : �������������� ���"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : ������� �����"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : �� ��������"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : ������� ���������"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : ����� ������� ����������"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n ������� ���������"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : ������"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : ������"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "��������� ������"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "���������� ���� ������"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "���������� ��� ������ ���� �� ����"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "���������� ��� ������ ���� �� ����"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "������������ ��� ������"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "�������� �� ������� ������"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "�������� ������"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "���������� ������"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "_��� �����"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "���������: ��� ���� �������� ����� �����!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "��������: ��� ���� �������� ����� �����!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "���������� ���� �� ����: ��� ���� �������� ����� �����!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "���������� ���� �� ����: ��� ���� �������� ����� �����!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 "������: �������� ����������� ��� ������� ��������� %s (%s)\n"
-""
+"\a"
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "�������� ���������� ��� ������� ���������  '%s' (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "������� ������ ���������..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "�������� ����������� � ���������� ��� ������� '%s' (%s)"
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
 "������: �������� ����������� ��� ������ ��� ������: %s (%s)\n"
-""
+"\a"
 
 #. Fall back to defaults
-#: src/setting.c:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "������� ��� ��������������� ������ ����������� ��������..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "������� ��� ��������������� ������ ������������ �������..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "������� ��� ��������������� ������ ������������ ���������..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "������: ��� ���� ������� � ��������� ������������� HOME!\n"
 "\n"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "������: �������� ����������� ��� ���������  '%s' (%s)!"
@@ -4952,6 +5053,36 @@ msgstr "�������� ������������ ��������"
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "� �������� ����� ����������!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "��������� �����/���������"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "������������� ���� ��������� �� ���� ����."
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "����������� ���������� �������:"
+
+#~ msgid "Files Name List :"
+#~ msgstr "����� �������� �������:"
+
+#, fuzzy
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(����� ���������� ������� MP3)"
+
+#, fuzzy
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(����� ���������� ������� MP3)"
+
 #, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "���������� ������ ��������"
@@ -5095,10 +5226,10 @@ msgstr ""
 #~ "�� '%s' ��� �������������!"
 
 #, fuzzy
-#~ msgid "ERROR while opening file: '%s' (%s)"
+#~ msgid "ERROR while opening file: '%s' (%s)\a"
 #~ msgstr ""
 #~ "������ ���� �� ������� ��� �������:  '%s' (%s).\n"
-#~ ""
+#~ "\a"
 
 #~ msgid "Load on startup the directory"
 #~ msgstr "������� ��� ��������� ���� ��� ��������"
diff --git a/po/es.gmo b/po/es.gmo
index c1bccda..b05e034 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 9e771f5..c3de23e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag-1.99.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2005-12-22 02:16+0100\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@tecknolabs.com>\n"
 "Language-Team:  <traductores@es.gnome.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
@@ -28,189 +28,231 @@ msgstr ""
 "interfaz GTK+ sencilla y agradable hace el etiquetar más fácil bajo GNU/"
 "Linux."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(Traducción alemana)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(Traducción rusa)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(Traducción holandesa)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(Traducción sueca)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(Traducción húngara)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(Traducción italiana)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(Traducción japonesa)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(Traducción ucraniana)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(Traducción checa)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(Traducción española)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(Traducción polaca)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(Traducción rumana)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(Traducción danesa)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(Traducción griega)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Traducción portugués brasileiro)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(Traducción búlgara)"
 
-#: src/about.c:160
+#: src/about.c:171
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(Traducción japonesa)"
 
-#: src/about.c:161
+#: src/about.c:172
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(Traducción griega)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(Traducción alemana)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Comentario"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "Acerca de..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "Acerca de"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compilado: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(usando: GTK+ %d.%d.%d e id3lib %d.%d.%d)"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(soporte para archivos MP3 deshabilitado)"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "Autor: %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(soporte para archivos MP3 deshabilitado)"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "Correo-e: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Página web: "
 
-#: src/about.c:292
+#: src/about.c:328
+msgid "Description:"
+msgstr "Descripción:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "(soporte para archivos MP3 deshabilitado)"
 
-#: src/about.c:296
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
 #, c-format
-msgid "(MP3 file support disabled)"
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
 msgstr "(soporte para archivos MP3 deshabilitado)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "No hay memoria suficiente"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(soporte para archivos Ogg Vorbis deshabilitado)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(soporte para archivos MP3 deshabilitado)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(soporte para archivos FLAC deshabilitado)"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
 msgstr "(soporte para archivos MP4/AAC deshabilitado)"
 
-#: src/about.c:322
+#: src/about.c:460
 #, fuzzy
-msgid "(WavPack file support disabled)"
+msgid "WavPack file support"
 msgstr "(soporte para archivos MP3 deshabilitado)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "Autor: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "Correo-e: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Página web: "
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "Descripción:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "Agradecimientos"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "Traducciones:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "General:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "Cambios"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -543,7 +585,7 @@ msgstr "Renombrar directorio..."
 msgid "Reload Directory"
 msgstr "Recargar directorio"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "Explorar directorio con..."
 
@@ -688,7 +730,7 @@ msgstr "Seleccionada la nueva ruta predeterminada para los archivos"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Aceptar..."
 
@@ -700,87 +742,66 @@ msgstr ""
 "Algunos archivos han sido modificados pero no guardados...\n"
 "¿Quiere guardarlos antes de cambiar de directorio?"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"La ruta introducida no es correcta!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "Error..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 #, fuzzy
 msgid "<All albums>"
 msgstr "# Álbumes"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, 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:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "Artista"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# Álbumes"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# Archivos"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Álbum"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Ir al directorio superior"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Introducir un directorio para explorar."
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Árbol"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "Artista y Álbum"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "Renombrar el directorio"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Renombrar el directorio «%s» a : "
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "Usar máscara :"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 msgid "If activated, it will use masks to rename directory."
 msgstr "Si está activado, usará máscaras para renombrar el directorio."
 
-#: src/browser.c:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -788,21 +809,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:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "Máscara para procesar inválida"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "Previsualizar el renombrado del directorio..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Error..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "¡Debe introducir un nombre de directorio!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -830,7 +861,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -839,7 +870,7 @@ msgstr ""
 "¡No se puede renombrar puesto que el nombre de directorio ya existe!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -854,51 +885,51 @@ msgstr ""
 "«%s»!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "Directorio renombrado"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Programa a ejecutar :"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 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:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "Abrir archivo con ..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 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:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "¡Debe introducir un nombre de programa!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "No se puede encontrar el programa «%s»"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "No se puede ejecutar «%s» (error %d)\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "¡No se puede crear otro proceso!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Comando ejecutado : «%s %s»"
@@ -987,7 +1018,7 @@ msgstr "Buscar en :"
 msgid "All Fields"
 msgstr "Todos los campos"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Otro"
 
@@ -1062,7 +1093,7 @@ msgstr " Categorías"
 msgid "Results :"
 msgstr "Resultados :"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "Buscar :"
 
@@ -1091,7 +1122,7 @@ msgstr "Deseleccionar todos"
 msgid "Invert lines selection"
 msgstr "Invertir la selección"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "Seleccionar todos"
 
@@ -1116,15 +1147,15 @@ msgstr "Establecer a:"
 msgid "All"
 msgstr "Todo"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "Nombre de archivo"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "Título"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "Año"
 
@@ -1136,12 +1167,12 @@ msgstr "Pista #"
 msgid "# Tracks"
 msgstr "# Pistas"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "Género"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Ejecutar el procesador para cada archivo"
 
@@ -1153,7 +1184,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1172,87 +1203,87 @@ msgstr ""
 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:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Listo para buscar..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, 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:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Invertir la selección"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Ordenar por número de pista"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Ordenar por nombre de pista"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Resolviendo anfitrión  «%s» ..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "¡No se puede resolver el anfitrión «%s» (%s)!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, 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:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Conectando a anfitrión «%s», puerto «%d» ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "¡No se puede conectar al anfitrión «%s» (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Conectado al anfitrión «%s»"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Obteniendo datos (%s) ..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Error al borrar la etiqueta ID3v1 de «%s» (%s)\n"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, 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:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, 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);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "Enviando petición ..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "¡No se puede enviar la petición (%s)!"
@@ -1261,91 +1292,91 @@ msgstr "¡No se puede enviar la petición (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "Obteniendo datos ..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "¡El servidor devolvió una respuesta errónea! (%s)"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "¡El servidor devolvió una respuesta errónea! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Lo siento, la búsqueda web no funciona ahora"
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Encontrados %d álbum(s) coincidentes"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Obteniendo datos (%s) ..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Obteniendo datos (%s) ..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d archivos seleccionados"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Listo para buscar..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, 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:3231
+#: src/cddb.c:3268
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Encontrados %d álbum(s) coincidentes"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, 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:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "Cargando la lista de pistas del álbum ..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1358,7 +1389,7 @@ msgstr ""
 "\n"
 "¿Continuar?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "Escribir etiqueta según CDDB..."
 
@@ -1637,11 +1668,11 @@ msgstr "Enlace a archivo roto"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, layer ?"
 
@@ -1649,7 +1680,7 @@ msgstr "?, layer ?"
 msgid "Bitrate:"
 msgstr "Tasa de bits:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1657,17 +1688,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Frecuencia:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Modo:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1851,13 +1882,13 @@ msgid "Tag selected files with these pictures"
 msgstr "Etiquetar archivos seleccionados con estas imágenes"
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
-msgstr "Eliminar imágenes seleccionadas, si no todas."
-
-#: src/easytag.c:1051
 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:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "Eliminar imágenes seleccionadas, si no todas."
+
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "Guardar las imágenes seleccionadas al disco duro."
@@ -2229,7 +2260,7 @@ msgstr "Eliminar archivo..."
 msgid "File '%s' deleted"
 msgstr "Archivo «%s» eliminado"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2241,110 +2272,110 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "Búsqueda en progreso..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "Archivo: «%s»"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, 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:3235
+#: src/easytag.c:3239
 #, 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:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u archivo(s)"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 "¡No se han encontrados archivos en este directorio y los subdirectorios!"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "¡No se han encontrado archivos en este directorio!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Buscando..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "  Parar la búsqueda...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "Seleccione un directorio para explorar."
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "Etiquetar archivos seleccionados con este campo"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Convertir «_» y «%20» a espacios"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "Convertir « » a «_»"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "TODAS MAYÚSCULAS"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "todas minúsculas"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "Primera letra mayúscula"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "Primera Letra De Cada Palabra Mayúscula"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "Borrar espacios"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Insertar espacios antes de una letra en mayúsculas"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 msgid "Remove duplicate spaces or underscores"
 msgstr "Borrar espacios o subrayados duplicados"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: ¡Terminación anormal! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, fuzzy, c-format
-msgid "Received signal %s (%d)"
-msgstr "Recibida señal %s (%d)\n"
+msgid "Received signal %s (%d)\a"
+msgstr "Recibida señal %s (%d)\a\n"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2354,12 +2385,12 @@ msgstr ""
 "del error con una traza gdb ('gdb easytag core' y entonces 'bt' y 'l') a "
 "easytag@gmail.com"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Señal desconocida"
 
-#: src/easytag.c:4466
-#, fuzzy
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2372,8 +2403,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2392,11 +2422,11 @@ msgstr ""
 "ruta_a/archivos     Usar una ruta relativa.\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Terminación normal."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2404,7 +2434,7 @@ msgstr ""
 "Algunos archivos han sido modificados pero no se han guardado...\n"
 "¿Desea guardarlos antes de salir del programa?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr "¿Realmente quiere salir del programa? "
 
@@ -2502,7 +2532,7 @@ msgstr ""
 "a la codificación del sistema\n"
 "(Intenta configurar la variable de entorno G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "Codificación del nombre del archivo"
 
@@ -2535,7 +2565,7 @@ msgstr "Canales"
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "ERROR al abrir archivo: «%s» (%s).\n"
-""
+"\a"
 
 #: src/flac_tag.c:983 src/ogg_tag.c:752
 #, c-format
@@ -2665,123 +2695,123 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "Archivo corrompido..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " Aceptar "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " Sí "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " No "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " Aplicar "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " Guardar "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " Cancelar "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " Cerrar "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " Escribir "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " Ejecutar "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr " Buscar "
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr " Examinar..."
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "Seleccionar directorio..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "Seleccionar archivo..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 #, fuzzy
 msgid "Warning..."
 msgstr "Buscando..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, 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:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "KiB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "MiB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "GiB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "TiB"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "Generar una lista de reproducción"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "Nombre de la lista M3U"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "Usar nombre del directorio"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Editar máscaras"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "Opciones de la lista de reproducción"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Incluir sólo los archivos seleccionados"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2789,31 +2819,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:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "Usar ruta completa para los archivos en la lista"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 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:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "Crear lista de reproducción en directorio superior"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 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:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "Usar el separador de directorio de DOS"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2821,23 +2851,23 @@ msgstr ""
 "Esta opción reemplaza el separador de directorio UNIX «/» por el separador "
 "DOS «\\»."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "Contenido de la lista de reproducción"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "Escribir sólo la lista de archivos"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "Escribir información utilizando el nombre de archivo"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Escribir información usando :"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2846,12 +2876,12 @@ msgstr ""
 "El archivo de la lista «%s» ya existe.\n"
 "¿Desea sobreescribirlo?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "Escribir lista de reproducción..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2860,48 +2890,44 @@ msgstr ""
 "No se puede escribir el archivo de lista «%s»\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Se ha escrito el archivo de la lista «%s»"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "Pista"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Comentario"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "Artista original"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "URL"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "Codificado por"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "Buscar un archivo"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2909,54 +2935,93 @@ msgstr ""
 "para mostrar todos los archivos."
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "En :"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "la etiqueta"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Distinguir capitalización"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Encontrados: %d archivo(s)"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "Leer nombres de archivo desde un archivo TXT"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 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:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " Cargar "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "Cargado el contenido del archivo :"
+#: src/misc.c:2810
+#, 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:2831 src/misc.c:2925
+#, 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:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Eliminar esta línea"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "Lista de nombre de archivos :"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+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:2861 src/misc.c:2955
+#, 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:2870 src/misc.c:2964
+#, 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:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Releer"
 
-#: src/misc.c:2828
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Escribir sólo la lista de archivos"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Seleccionar todos"
+
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2964,21 +3029,23 @@ 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:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "Insertar una línea en blanco"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "Eliminar esta línea"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "Borrar todas las líneas en blanco"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Subir esta máscara"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "Releer"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Bajar esta máscara"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3113,111 +3180,111 @@ msgstr ""
 msgid "Save file..."
 msgstr "Guardar archivo..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "imagen JPEG"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "imagen PNG"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "Imagen desconocida"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "icono archivo PNG de 32x32 píxeles."
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "Otro icono de fichero"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "Carátula (frontal)"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "Carátula (trasera)"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "Página del folleto"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "Soporte (ej. lateral de la etiqueta del CD)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "Artista líder/intérprete líder/solista"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "Artista/intérprete"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "Director"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "Banda/Orquesta"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "Letrista/escritor"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "Lugar de grabación"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "Durante la grabación"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "Durante la actuación"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "Película/captura de vídeo"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "Un pescado brillante coloreado"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "Ilustración"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "Banda/Logotipo de artista"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "Editor/Logotipo del estudio"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "Tipo de imagen desconocido"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "píxeles"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "Tipo"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "Descripción"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3225,11 +3292,11 @@ msgstr ""
 "No se puede mostrar la imagen, debido a que no se han leído suficientes "
 "datos para determinar cómo crear el búfer de la imagen."
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "Cargando archivo de imagen..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3240,7 +3307,7 @@ msgstr ""
 "«%s»\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "Archivo de imagen no cargado..."
 
@@ -3497,24 +3564,53 @@ msgstr ""
 "algunos argumentos al programa ( como en 'xmms -p') antes de recibir los "
 "archivos como argumentos."
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Opciones de etiquetas"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "Centro de la ventana principal"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr ""
+"Si está seleccionado, la lista de reproducción se creará en el directorio "
+"superior."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "Configuración de archivo"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "Opciones de archivo"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr ""
 "Reemplazar caracteres ilegales en nombres de archivo (para Windows y CD-ROM)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3527,40 +3623,40 @@ msgstr ""
 "archivos desde la etiqueta con el procesador."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "Convertir la extensión a:"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "Minúsculas"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "Por ejemplo, la extensión será convertida a '.mp3'"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "Mayúsculas"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "Por ejemplo, la extensión será convertida a '.MP3'"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "Sin cambios"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "La extensión no será convertida"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "Preservar el tiempo de modificación del archivo"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
@@ -3568,13 +3664,13 @@ msgstr ""
 "guardar el archivo."
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3585,12 +3681,12 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr "Conjunto de caracteres para el nombre del archivo"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
@@ -3598,11 +3694,11 @@ msgstr ""
 "Reglas para aplicar si algunos caracteres no pueden convertirse a la "
 "codificación de caracteres del sistema al escribir el nombre del archivo:"
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "Intentar otra codificación de caracteres"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
@@ -3613,14 +3709,14 @@ msgstr ""
 "'ru', ISO8859-2 para 'ro'). Si falla, intentará con la codificación de "
 "caracteres ISO-8859-1."
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 "Forzar el uso de la codificación de caracteres del sistema y activar la "
 "transliteración"
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3630,7 +3726,7 @@ msgstr ""
 "caracteres destino, puede ser aproximado a través de caracteres de "
 "apariencia similar."
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
@@ -3638,7 +3734,7 @@ msgstr ""
 "Forzar el uso de la codificación de caracteres del sistema y descartar "
 "silenciosamente algunos caracteres"
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3649,20 +3745,20 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "Configuración de etiquetas"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "Opciones de etiquetas"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "Autocompletado de la fecha si no está completa"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3672,11 +3768,11 @@ msgstr ""
 "numerales de la fecha (por ejemplo, si el año actual es 2005: 5 => 2005, 4 "
 "=> 2004, 6 => 1996, 95 => 1995, ...)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "Escribir el campo de pista con el siguiente número de dígitos:"
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3686,11 +3782,11 @@ msgstr ""
 "especificados como relleno (Ej: con dos dígitos: «05», «09», «10». En caso "
 "contrario se conserva el valor «en bruto» de la pista."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Archivos Ogg Vorbis: escribir también el comentario al formato XMMS"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3704,7 +3800,7 @@ msgstr ""
 "esta opción si quiere que otras aplicaciones no se vean afectadas por un "
 "campo desconocido. Sin embargo, los comentarios no se mostraran en XMMS."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
@@ -3712,11 +3808,11 @@ msgstr ""
 "Enfocar el campo de la etiqueta al cambiar de archivo en la lista con las "
 "teclas AvPág/RePág:"
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr "Mantener el foco en el mismo campo de la etiqueta"
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr "Devolver el foco al primer campo de la etiqueta (o sea, «Título»)"
 
@@ -3724,22 +3820,22 @@ msgstr "Devolver el foco al primer campo de la etiqueta (o sea, «Título»)"
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "Configuración de etiquetas ID3"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "Reglas para etiquetas ID3"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 #, fuzzy
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "Escribir etiquetas ID3 en archivos FLAC con etiqueta FLAC"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3749,11 +3845,11 @@ msgstr ""
 "suprimida la ID3."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "Quitar etiquetas si todos los campos están en blanco"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3766,11 +3862,11 @@ msgstr ""
 "datos estándar estén en blanco."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Convertir automáticamente versiones antiguas de ID3v2"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3779,42 +3875,42 @@ msgstr ""
 "actualizada a una de la versión ID3v2.3."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 #, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "Escribir etiquetas ID3v2"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Conjunto de caracteres para las etiquetas ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Escribir etiquetas ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "Escribir etiquetas ID3v2"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3824,12 +3920,12 @@ msgstr ""
 "principio de los archivos MP3. De otra manera será suprimida."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 #, fuzzy
 msgid "Version:"
 msgstr "Descripción:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3838,22 +3934,22 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Codificado por"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 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 "
@@ -3861,35 +3957,35 @@ msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 #, fuzzy
 msgid "No"
 msgstr " No "
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "Etiqueta ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "Escribir etiquetas ID3v1.x"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3897,7 +3993,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:846
+#: src/prefs.c:878
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
@@ -3905,16 +4001,16 @@ msgstr ""
 "archivo."
 
 #. Character Set for reading tag
-#: src/prefs.c:878
+#: src/prefs.c:910
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Conjunto de caracteres para las etiquetas ID3"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3944,7 +4040,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:914
+#: src/prefs.c:947
 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 "
@@ -3953,24 +4049,24 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Procesador"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Procesador de etiquetas - Conversión de caracteres"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Convertir caracteres de subrayado «_» y la cadena «%20» a espacios « »"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Convertir espacios « » a subrayados «_»"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -3979,11 +4075,11 @@ msgstr ""
 "máscara desde el procesador para etiquetas."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Renombrado de archivos - Conversión de caracteres"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -3992,19 +4088,19 @@ msgstr ""
 "máscara."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 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:1001
+#: src/prefs.c:1034
 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:1005
+#: src/prefs.c:1038
 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 "
@@ -4017,15 +4113,15 @@ msgstr ""
 "'Texto En Una Entrada')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Ventana del procesador"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Abrir la ventana del procesador al arrancar."
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4033,11 +4129,11 @@ msgstr ""
 "Seleccione esta opción para abrir automáticamente la ventana del procesador "
 "cuando EasyTAG comience."
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Ventana del procesador siempre encima"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4046,16 +4142,16 @@ msgstr ""
 "siempre sobre la ventana principal."
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "Campos"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Sobreescribir campos al procesar etiquetas"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4064,11 +4160,11 @@ msgstr ""
 "campos por los nuevos. Si está deseleccionado, sólo los campos en blanco de "
 "las etiquetas serán completadas."
 
-#: src/prefs.c:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "Establecer este texto como comentario predeterminado :"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4077,12 +4173,12 @@ msgstr ""
 "comentario al usar el procesador «Rellenar etiqueta»."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 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:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4093,46 +4189,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "Base de datos de CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Búsqueda automática"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "Nombre :"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "Puerto :"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "Ruta a CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Opciones del servidor"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "Base de datos de CD"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 #, fuzzy
 msgid "Path :"
 msgstr "Ruta a CGI :"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4141,52 +4237,52 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Configuración de proxy"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Usar un proxy"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Activar la configuración del servidor proxy."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "Anfitrión:"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Nombre del servidor proxy."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Puerto del servidor proxy."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "Usuario:"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "Nombre de usuario en el servidor proxy."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "Contraseña :"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr "Contraseña en el servidor proxy."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "Lista de nombre de pista"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4194,7 +4290,7 @@ msgstr ""
 "Seleccionar el archivo de sonido correspondiente (de acuerdo con posición o "
 "DLM si estuviese activado abajo)"
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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."
@@ -4204,7 +4300,7 @@ msgstr ""
 "seleccionará también."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4215,15 +4311,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Confirmar"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Confirmar la salida del programa"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4231,53 +4327,57 @@ msgstr ""
 "Si está seleccionado, muestra una cuadro de diálogo para confirmar si se "
 "desea salir del programa."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "Confirmar la escritura de la etiqueta de archivos"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "Confirmar el renombrado de archivos"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "Confirmar el borrado de archivos"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "Confirmar la escritura de la lista de reproducción"
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Aplicar cambios (pero no guardar) y cerrar esta ventana"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "Cerrar esta ventana sin guardar"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 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:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Ejemplo : %.*d_-_Pista_nombre_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "Cambios aplicados"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "Configuración guardada"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "Configuración sin cambios"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4288,11 +4388,11 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "No es un directorio"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "El reproductor del archivo de sonido «%s» no se puede encontrar"
@@ -4309,36 +4409,36 @@ msgstr "Renombrar archivo y directorio"
 msgid "Process Fields"
 msgstr "Procesar campos"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "Se procesaron con éxito las etiquetas..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Se procesaron con éxito las etiquetas...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, 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:660
+#: src/scan.c:663
 #, 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:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "Nuevo nombre de archivo procesado con éxito..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nuevo nombre de archivo procesado con éxito...(%s)"
@@ -4346,41 +4446,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "Procesar etiqueta y nombre de archivo"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Procesador :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "Elegir el tipo de procesador a usar"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Abrir ventana del procesador / Procesar archivos seleccionados"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Opciones del procesador"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Mostrar / Ocultar editor de máscaras"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Mostrar / Ocultar leyenda"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4390,15 +4490,15 @@ msgstr ""
 "etiquetas."
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "Vista previa del relleno de la etiqueta..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr "Máscara del prefijo con la ruta actual"
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4411,15 +4511,15 @@ msgstr ""
 "absoluta, en otro caso, es relativa a la ruta anterior."
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "Previsualizar el renombrado de archivo..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Elegir campos:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4428,126 +4528,126 @@ msgstr ""
 "Elija aquellos que le interesen."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 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:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "Procesar el campo de título"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "Procesar el campo de artista"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Procesar el campo de álbum"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "Procesar el campo de género"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "Procesar el campo de comentario"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Procesar el campo del compositor"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 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:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Procesar el campo de copyright"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "Procesar el campo de URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "Procesar el campo de codificador"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Invertir la selección"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Seleccionar/Deseleccionar todo."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Convertir '_' y '%20' a ' '"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Convertir :"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "a : "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4555,7 +4655,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:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4563,11 +4663,12 @@ 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:2171
-msgid "Replace a character by an other one."
-msgstr "Reemplazar un carácter por otro."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4575,7 +4676,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:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4583,7 +4684,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:2209
+#: src/scan.c:2325
 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'."
@@ -4591,7 +4692,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:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4599,15 +4700,15 @@ 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:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Insertar un espacio antes de una letra mayúscula"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "Borrar espacios o subrayados duplicados"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4615,7 +4716,7 @@ msgstr ""
 "Todos los espacios entre palabras son borrados. Ejemplo, antes: 'Texto En "
 "Una Entrada', después: 'TextoEnUnaEntrada'."
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4623,7 +4724,7 @@ msgstr ""
 "Se inserta un espacio antes de cada letra mayúscula. Ejemplo, antes: "
 "'TextoEnUnaEntrada', después: 'Texto En Una Entrada'."
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4634,190 +4735,190 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "Leyenda"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artista"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : álbum"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : comentario"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p : compositor"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r: copyright"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : número de disco"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : codificado por"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : género"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorado"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : número de pistas"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : artista orig."
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : pista"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : título"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u: URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : año"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Editor de máscaras"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "Crear nueva máscara"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Subir esta máscara"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Bajar esta máscara"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Duplicar máscara"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Añadir máscara predeterminada"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "Borrar máscara"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Guardar máscaras"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "Nueva_máscara"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "Copiar: ¡ninguna fila seleccionada!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "Borrar: ¡ninguna fila seleccionada!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Subir: ¡ninguna fila seleccionada!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Bajar: ¡ninguna fila seleccionada!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, 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:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, 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:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "Cargando la configuración predeterminada..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, 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:1264
+#: src/setting.c:1278
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
 "ERROR: No se puede escribir la lista al archivo: %s (%s)\n"
-""
+"\a"
 
 #. Fall back to defaults
-#: src/setting.c:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Cargando máscaras de «Rellenar etiqueta» predefinidas..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "Cargando máscaras de 'Renombrar archivo' predefinidas..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Cargar las máscaras de 'Renombrar directorio' predefinidas..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 #, 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:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ERROR: ¡No se puede crear el directorio «%s» (%s)!"
@@ -4903,6 +5004,36 @@ msgstr "Ejecutar reproductor de audio"
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "La ruta introducida no es correcta!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Distinguir capitalización"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Reemplazar un carácter por otro."
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Cargado el contenido del archivo :"
+
+#~ msgid "Files Name List :"
+#~ msgstr "Lista de nombre de archivos :"
+
+#, fuzzy
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(soporte para archivos MP3 deshabilitado)"
+
+#, fuzzy
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(soporte para archivos MP3 deshabilitado)"
+
 #, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "Versión de etiqueta inválida"
@@ -5048,10 +5179,10 @@ msgstr ""
 #~ "a «%s» no está soportada!"
 
 #, fuzzy
-#~ msgid "ERROR while opening file: '%s' (%s)"
+#~ msgid "ERROR while opening file: '%s' (%s)\a"
 #~ msgstr ""
 #~ "ERROR al abrir archivo: «%s» (%s).\n"
-#~ ""
+#~ "\a"
 
 #~ msgid "Load on startup the directory"
 #~ msgstr "Leer el directorio al inicio"
diff --git a/po/fr.gmo b/po/fr.gmo
index 837aeab..2e5e575 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index c48861d..18246f5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: EasyTAG 2.1.\n"
+"Project-Id-Version: EasyTAG 2.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
-"PO-Revision-Date: 2007-06-24 20:41+0100\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
+"PO-Revision-Date: 2007-10-07 10:41+0100\n"
 "Last-Translator: Jerome Couderc <easytag@gmail.com>Language-Team: French "
 "<fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
@@ -27,184 +27,220 @@ msgstr ""
 "Son interface GTK+ simple et agr�able rend le marquage plus simple sous GNU/"
 "Linux."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(traduction Allemande)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(traduction Russe)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(traduction Hollandaise)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(traduction Su�doise)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(traduction Hongroise)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(traduction Italienne)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(traduction Japonaise)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(traduction Ukrainienne)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(traduction Tch�que)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(traduction Espagnole)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(traduction Polonaise)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(traduction Roumaine)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(traduction Danoise)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(traduction Grecque)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(traduction Portugais Br�silien)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(traduction Bulgare)"
 
-#: src/about.c:160
+#: src/about.c:171
 msgid "(Chinese translation)"
 msgstr "(traduction Chinoise)"
 
-#: src/about.c:161
+#: src/about.c:172
 msgid "(Hebrew translation)"
 msgstr "(traduction H�bra�que)"
 
+#: src/about.c:173
+msgid "(Serbian translation)"
+msgstr "(traduction Serbe)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr "Nom de l'extension"
+
+#: src/about.c:227
+msgid "Status"
+msgstr "Statut"
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Comment."
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "A Propos..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "A Propos"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compil� le: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(utilis�: GTK+ %d.%d.%d)"
 
-#: src/about.c:283
+#: src/about.c:305
 #, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(Support des fichiers MP3 activ� en utilisant : libid3tag %s)"
+msgid "Author: %s"
+msgstr "Auteur : %s"
 
-#: src/about.c:287
+#: src/about.c:309 src/easytag.c:212
 #, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(Support des tags ID3v2.3 activ� en utilisant : id3lib %d.%d.%d)"
+msgid "E-mail: %s"
+msgstr "E-mail : %s"
 
-#: src/about.c:292
-msgid "(ID3v2.3 tags  support disabled)"
-msgstr "(Support des tags ID3v2.3 d�sactiv�)"
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Page Web : "
 
-#: src/about.c:296
-#, c-format
-msgid "(MP3 file support disabled)"
-msgstr "(Support des fichiers MP3 d�sactiv�)"
+#: src/about.c:328
+msgid "Description:"
+msgstr "Description :"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
-msgstr "(Support des fichiers Ogg Vorbis d�sactiv�)"
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr "Extensions"
 
-#: src/about.c:307
-msgid "(Speex file support disabled)"
-msgstr "(Support des fichiers Speex d�sactiv�)"
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr "libid3tag %s"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
-msgstr "(Support des fichiers FLAC d�sactiv�)"
+#: src/about.c:394
+msgid "MP3 file support"
+msgstr "Support des fichiers MP3"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
-msgstr "(Support des fichiers MP4/AAC d�sactiv�)"
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr "activ�"
 
-#: src/about.c:322
-msgid "(WavPack file support disabled)"
-msgstr "(Support des fichiers WavPack d�sactiv�)"
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr "d�sactiv�"
 
-#: src/about.c:330
+#: src/about.c:404
 #, c-format
-msgid "Author: %s"
-msgstr "Auteur : %s"
+msgid "id3lib %d.%d.%d"
+msgstr "id3lib %d.%d.%d"
 
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-mail : %s"
+#: src/about.c:408
+msgid "ID3v2.3 tags writting support"
+msgstr "Support des tags ID3v2.3"
 
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Page Web : "
+#: src/about.c:410
+msgid "available"
+msgstr "disponible"
 
-#: src/about.c:352
-msgid "Description:"
-msgstr "Description :"
+#: src/about.c:420
+msgid "Ogg Vorbis file support"
+msgstr "Support des fichiers Ogg Vorbis"
+
+#: src/about.c:430
+msgid "Speex file support"
+msgstr "Support des fichiers Speex"
+
+#: src/about.c:440
+msgid "FLAC file support"
+msgstr "Support des fichiers FLAC"
+
+#: src/about.c:450
+msgid "MP4/AAC file support"
+msgstr "Support des fichiers MP4/AAC"
+
+#: src/about.c:460
+msgid "WavPack file support"
+msgstr "Support des fichiers WavPack"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "Remerciements"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "Traductions :\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "G�n�ral :\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "Historique"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -537,7 +573,7 @@ msgstr "Renommer le R�pertoire ..."
 msgid "Reload Directory"
 msgstr "Recharger le R�pertoire"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "Parcourir le R�pertoire avec ..."
 
@@ -682,7 +718,7 @@ msgstr "Un nouveau chemin par d�faut a �t� s�lectionn�"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Confirmer..."
 
@@ -694,87 +730,66 @@ 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:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"Le chemin donn� est incorrect!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "Erreur..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 msgid "<All albums>"
 msgstr "<Tous les albums>"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, 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:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# Albums"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# Fichiers"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Aller dans le R�pertoire Parent"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Entrer un r�pertoire �parcourir."
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Arborescence"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "Artiste & Album"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "Renommer le R�pertoire"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Renommer le r�pertoire '%s' en :"
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "Utiliser le masque :"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 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:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -782,21 +797,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:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "Masque de Scanner Invalide"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "Apercu du renommeur de r�pertoires..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Erreur..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "Vous devez saisir un nom de r�pertoire!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -825,7 +850,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -834,7 +859,7 @@ msgstr ""
 "Impossible de renommer car ce r�pertoire existe d�j�!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -849,49 +874,49 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "R�pertoire renomm�"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Programme � lancer :"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 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:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "Ouvrir le Fichier avec ..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 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:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "Vous devez saisir un nom de programme!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Le programme '%s' n'a pas �t� trouv�!"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Impossible d'ex�cuter %s (erreur %d)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "Ne peut lancer un processus fils!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Commande ex�cut�e : '%s %s'"
@@ -979,7 +1004,7 @@ msgstr "Rechercher dans :"
 msgid "All Fields"
 msgstr "Tous les Champs"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Autres"
 
@@ -1054,7 +1079,7 @@ msgstr " Cat�gories "
 msgid "Results :"
 msgstr "R�sultats :"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "Rechercher :"
 
@@ -1084,7 +1109,7 @@ msgstr "D�s�lectionner toutes les lignes"
 msgid "Invert lines selection"
 msgstr "Inverser la s�lection des lignes"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "S�lectionner toutes les lignes"
 
@@ -1110,15 +1135,15 @@ msgstr "Mettre dans :"
 msgid "All"
 msgstr "Tous"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "Nom de Fichier"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "Titre"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "Ann�e"
 
@@ -1130,12 +1155,12 @@ msgstr "N� Piste"
 msgid "# Tracks"
 msgstr "Nbr Pistes"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "Genre"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Ex�cuter le scanner courant pour chaque fichier"
 
@@ -1147,7 +1172,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1167,87 +1192,87 @@ msgstr ""
 "Charger les lignes s�lectionn�es ou toutes les lignes (si aucune n'est "
 "s�lectionn�e)"
 
-#: src/cddb.c:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Pr�t � chercher..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, 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:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Inverser la s�lection"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Classer par Num�ro de Piste"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Classer par Nom de Piste"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Obtention de l'h�te '%s' ..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Impossible d'obtenir l'h�te '%s' (%s)!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, 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:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Connexion en cours sur l'h�te '%s' (port '%d') ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Impossible de se connecter sur l'h�te '%s' (%s)"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Connect� sur l'h�te '%s'"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "R�ception des donn�es (%s) ..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Erreur lors de la lecture de la r�ponse cddb (%s)!"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Impossible de cr�er le fichier '%s' (%s)"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Impossible d'ouvrir le fichier '%s' (%s)"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "Envoi de la requ�te ..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Impossible d'envoyer la requ�te (%s)!"
@@ -1256,62 +1281,62 @@ msgstr "Impossible d'envoyer la requ�te (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "R�ception des donn�es ..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 msgid "The server returned a wrong answer!"
 msgstr "Le serveur a retourn� une mauvaise r�ponse!"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Le serveur a retourn� une mauvaise r�ponse! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 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:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Trouv�(s) %d album(s) correspondant(s)"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, 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:2570
+#: src/cddb.c:2587
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "R�ception des donn�es de la page %d ..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr "D'autres r�sultats � charger ..."
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 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:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d fichier(s) s�lectionn�(s)!"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 msgid "Local CD search..."
 msgstr "Recherche CD locale ..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
@@ -1320,27 +1345,27 @@ msgstr ""
 "Renseignez le dans la fen�tre des pr�f�rences."
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, 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:3231
+#: src/cddb.c:3268
 #, 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:3327
+#: src/cddb.c:3364
 #, 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:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "Chargement de la liste des pistes de l'album ..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1353,7 +1378,7 @@ msgstr ""
 "\n"
 "Voulez-vous continuer ?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "Ecriture des Tags � partir de CDDB..."
 
@@ -1627,11 +1652,11 @@ msgstr "Fichier Introuvable"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
@@ -1639,7 +1664,7 @@ msgstr "?, Layer ?"
 msgid "Bitrate:"
 msgstr "D�bit:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1647,17 +1672,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Fr�q:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mode:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1840,13 +1865,13 @@ msgid "Tag selected files with these pictures"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec ces images"
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
-msgstr "Effacer les images s�lectionn�es, sinon toutes."
-
-#: src/easytag.c:1051
 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:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "Effacer les images s�lectionn�es, sinon toutes."
+
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "Sauvegarder les fichiers s�lectionn�s sur le disque dur."
@@ -2221,7 +2246,7 @@ msgstr "Effacer le Fichier..."
 msgid "File '%s' deleted"
 msgstr "Fichier: '%s' effac�"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2233,109 +2258,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "Recherche en cours..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "Fichier: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, 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:3235
+#: src/easytag.c:3239
 #, 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:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u fichier(s)"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr "Aucun fichier trouv� dans ce r�pertoire et sous r�pertoires!"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "Aucun fichier trouv� dans ce r�pertoire!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Recherche en cours..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "  ARRETER la recherche...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "S�l�ctionner un r�pertoire � parcourir!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "Tagger les fichiers s�lectionn�s avec ce champ"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Convertir '_' et '%20' par un espace"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "Convertir ' ' par '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "Tout en majuscule"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "Tout en minuscule"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "Premi�re lettre en majuscule"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "Premi�re lettre de chaque mot en majuscule"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "Enlever les espaces"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Ins�rer un espace avant une majuscule"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 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:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Sortie anormale! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, c-format
-msgid "Received signal %s (%d)"
-msgstr "Signal re�u %s (%d)"
+msgid "Received signal %s (%d)\a"
+msgstr "Signal re�u %s (%d)\a"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2345,11 +2370,12 @@ 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@gmail.com>"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Signal inconnu"
 
-#: src/easytag.c:4466
+#: src/easytag.c:4479
+#, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2362,8 +2388,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2378,16 +2403,15 @@ msgstr ""
 "\n"
 "R�pertoire:\n"
 "-----------\n"
-"c:/path_to/files  Utiliser un chemin absolu � charger,\n"
-"/path_to/files    Utiliser un chemin absolu � charger,\n"
+"%s/path_to/files  Utiliser un chemin absolu � charger,\n"
 "path_to/files     Utiliser un chemin relatif.\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Sortie normale."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2395,7 +2419,7 @@ msgstr ""
 "Des fichiers ont �t� modifi�s mais pas sauv�s...\n"
 "Voulez-vous les sauver avant de quitter le programme?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr " Voulez-vous r�ellement quitter le programme ?"
 
@@ -2491,7 +2515,7 @@ 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:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "Conversion du nom de fichier"
 
@@ -2663,122 +2687,122 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "Fichier corrompu..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr "Journal"
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " OK "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " Oui "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " Non "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " Appliquer "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " Sauver "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " Annuler "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " Fermer "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " Ecrire "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " Ex�cuter "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr " Rechercher "
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr "Parcourir..."
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "S�lectionner un r�pertoire..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "S�lectionner un fichier..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "Warning..."
 msgstr "Attention..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr "Aucun lecteur audio n'a �t� d�fini!"
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, 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:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "o"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "Ko"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "Mo"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "Go"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "To"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "G�n�rer une liste de lecture"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "Nom de la Liste de Lecture M3U"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "Utiliser le nom du r�pertoire"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Editer les Masques"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "Options de la Liste de Lecture"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Inclure seulement les fichiers s�lectionn�s"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2786,30 +2810,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:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "Utiliser le chemin complet pour les fichiers"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 msgid "Use relative path for files in playlist"
 msgstr "Utiliser le chemin relatif pour les fichiers"
 
 #. Create playlist in parent directory
-#: src/misc.c:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "Cr�er la Liste de Lecture dans le r�p. sup�rieur"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 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:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "Utiliser le s�parateur de r�pertoires DOS"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2817,23 +2841,23 @@ msgstr ""
 "Cette option remplace le s�parateur de r�pertoires UNIX '/' par celui de DOS "
 "'\\'."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "Contenu de la Liste de Lecture"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "Ecrire seulement la liste des fichiers"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "Ecrire les infos en utilisant le nom du fichier"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Ecrire les infos en utilisant :"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2842,12 +2866,12 @@ msgstr ""
 "Le fichier '%s' existe d�j�!\n"
 "L'�craser?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "Ecrire Liste de Lecture..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2856,48 +2880,44 @@ msgstr ""
 "Impossible d'�crire la liste de lecture '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "La liste de lecture '%s' a �t� �crite"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "Piste"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Comment."
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "Compositeur"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "Artiste Orig."
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "URL"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "Encodeur"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "Rechercher un fichier"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2905,54 +2925,86 @@ msgstr ""
 "afficher."
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "Dans :"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "le Tag"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Sensible � la casse"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Trouv�(s) : %d fichier(s)"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "Charger les noms des fichiers � partir d'un fichier TXT"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 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:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " Charger "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "Contenu du Fichier Charg� :"
+#: src/misc.c:2810
+msgid "Content of TXT file"
+msgstr "Contenu du fichier TXT"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+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:2840 src/misc.c:2934
+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:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "Effacer toutes les lignes vides"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+msgid "Move up the selected line"
+msgstr "Monter la ligne s�lectionn�e"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "Liste des Noms des Fichiers :"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+msgid "Move down the selected line"
+msgstr "Descendre la ligne s�lectionn�e"
 
-#: src/misc.c:2828
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Recharger"
+
+#: src/misc.c:2903
+msgid "List of files"
+msgstr "Liste de fichiers"
+
+#: src/misc.c:2998
+msgid "Selected line:"
+msgstr "Ligne s�lectionn�e"
+
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2960,21 +3012,21 @@ 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:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "Ins�rer une ligne vide"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "Effacer cette ligne"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "Effacer toutes les lignes vides"
+#: src/misc.c:3424
+msgid "Move up this line"
+msgstr "Monter cette ligne"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "Recharger"
+#: src/misc.c:3430
+msgid "Move down this line"
+msgstr "Descendre cette ligne"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3118,111 +3170,111 @@ msgstr ""
 msgid "Save file..."
 msgstr "Sauvegarder le fichier..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "Image JPEG"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "Image PNG"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "Image inconnue"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "Fichier icone PNG de 32x32 pixels"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "Autre fichier icone"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "Couverture (face avant)"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "Couverture (face arri�re)"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "D�pliant int�rieur"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "Image de l'album"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "Artiste principal/Soliste"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "Artiste"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "Chef d'orchestre"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "Groupe/Orchestre"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "Parolier/Ecrivain"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "Lieu d'enregistrement"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "Artistes pendant l'enregistrement"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "Artistes pendant la repr�sentation"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "Capture d'�cran film/video"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "Un poisson aux couleurs vives"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "Illustration"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "Logo du groupe/de l'artiste"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "Maison d'�dition/Sigle du studio"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "Type d'image inconnu"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "pixels"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "Type"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "Description"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3230,11 +3282,11 @@ msgstr ""
 "Impossible d'afficher l'image, car il n'y a pas assez de donn�es lues pour "
 "cr�er le buffer image."
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "Chargement du fichier image..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3245,7 +3297,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "Image non charg�e..."
 
@@ -3504,25 +3556,49 @@ msgstr ""
 "peuvent �tre pass�s au programme (ex: 'xmms -p') avant de recevoir les "
 "fichiers comme autres arguments."
 
+#. Log options
+#: src/prefs.c:411
+msgid "Log Options"
+msgstr "Options du journal"
+
+#. Show / hide log view
+#: src/prefs.c:418
+msgid "Show log view in main window"
+msgstr "Afficher le journal sur la fen�tre principale"
+
+#: src/prefs.c:421
+msgid "If activated, the log view would be visible in the main window."
+msgstr "Si activ�, le journal sera affich� sur la fen�tre principale."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr "Nombre maximum de lignes:"
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "Param�tres du nom des fichiers"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "Options pour les Fichiers"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr ""
 "Remplacer les caract�res ill�gaux des noms de fichiers (pour Windows et les "
 "CD-Rom)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3536,40 +3612,40 @@ msgstr ""
 "avec le scanner."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "Convertir l'extension du fichier en :"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "Minuscules"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "Par exemple, l'extension sera convertie en '.mp3'"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "Majuscules"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "Par exemple, l'extension sera convertie en '.MP3'"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "Pas de Changement"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "L'extension ne sera pas convertie"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "Conserver la date de modification du fichier"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
@@ -3577,7 +3653,7 @@ msgstr ""
 "sauvegarde du fichier."
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
@@ -3585,7 +3661,7 @@ msgstr ""
 "Changer la date de modification du r�pertoire parent au fichier (recommand� "
 "si utilisation d'Amarok)"
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3603,12 +3679,12 @@ msgstr ""
 "parent."
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr "Jeu de caract�res pour les noms de fichiers"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
@@ -3617,11 +3693,11 @@ msgstr ""
 "l'encodage du syst�me\n"
 "lors de l'�criture du nom de fichier :"
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "Essayer un autre encodage"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
@@ -3631,13 +3707,13 @@ msgstr ""
 "(par exemple : ISO-8859-1 pour 'fr', KOI8-R pour 'ru', ISO-8859-2 pour "
 "'ro'). Si il �choue, il essayera l'encodage ISO-8859-1."
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 "Forcer l'utilisation de l'encodage du syst�me et activer la transcription"
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3647,7 +3723,7 @@ msgstr ""
 "l'encodage cible, il pourra �tre approxim� par un ou plusieurs caract�res se "
 "ressemblant visuellement."
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
@@ -3655,7 +3731,7 @@ msgstr ""
 "Forcer l'utilisation de l'encodage du syst�me et supprimer certains "
 "caract�res"
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3666,20 +3742,20 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "Param�tres des Tags"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "Options de Tag"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "Compl�ter automatiquement la date si elle est incompl�te"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3689,11 +3765,11 @@ msgstr ""
 "chiffres de la date (par exemple, si la date courante est 2005: 5 => 2005, 4 "
 "=> 2004, 6 => 1996, 95 => 1995, ...)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "Ecrire le num�ro de piste avec le nombre de chiffres suivant :"
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3703,11 +3779,11 @@ msgstr ""
 "en remplissant � gauche avec le nombre '0' (Ex avec deux chiffres : '05', "
 "'09', '10',...). Sinon, le num�ro est laiss� tel quel."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Fichiers Ogg Vorbis : Ecrire aussi le commentaire au format XMMS"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3722,7 +3798,7 @@ msgstr ""
 "appara�tre un champ inconnu dans Winamp par exemple. Mais le commentaire ne "
 "pourra pas �tre affich� dans XMMS."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
@@ -3730,11 +3806,11 @@ msgstr ""
 "Focus du champ du tag lors du changement de fichier avec les raccourcis Page "
 "Haut/Page Bas"
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr "Garder le focus sur le m�me champ du tag"
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr "Redonner le focus au premier champ du tag (champ 'Titre')"
 
@@ -3742,21 +3818,21 @@ msgstr "Redonner le focus au premier champ du tag (champ 'Titre')"
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "Param�tres des Tags ID3"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "R�gles pour les Tags ID3"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "Ecrire des tags ID3 dans les fichiers FLAC (en plus du tag FLAC)"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3766,11 +3842,11 @@ msgstr ""
 "supprim�s."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "Supprimer les tags si tous les champs sont vides"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3783,11 +3859,11 @@ msgstr ""
 "enti�rement le tag lorsque ces sept donn�es sont vides."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Convertir automatiquement les anciennes versions de tag ID3v2"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3796,39 +3872,39 @@ msgstr ""
 "en version ID3v2.3."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr "Utiliser CRC32"
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "Utiliser CRC32 dans les tags ID3v2"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr "Utiliser la compression"
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr "Utiliser la compression dans les tags ID3v2"
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 msgid "Character Set for writing ID3 tags"
 msgstr "Jeu de caract�res pour �crire les tags ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 msgid "ID3v2 tags"
 msgstr "Tags ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "Ecrire le tag ID3v2"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -3837,11 +3913,11 @@ msgstr ""
 "jour au d�but des fichiers MP3. Sinon, il sera supprim�."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 msgid "Version:"
 msgstr "Version :"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3853,20 +3929,20 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr "Jeu de charact�res :"
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 msgid "Unicode "
 msgstr "Unicode"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 msgid "Unicode type to use"
 msgstr "Type d'Unicode � utiliser"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 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 "
@@ -3874,33 +3950,33 @@ msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr "Param�tres suppl�mentaires pour iconv() :"
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 msgid "No"
 msgstr "Non"
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 msgid "ID3v1 tags"
 msgstr "Tags ID3v1"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "Ecrire le tag ID3v1.x"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3908,22 +3984,22 @@ 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:846
+#: src/prefs.c:878
 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:878
+#: src/prefs.c:910
 msgid "Character Set for reading ID3 tags"
 msgstr "Jeu de caract�res pour lire les tags ID3"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr "Non standard :"
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3954,7 +4030,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:914
+#: src/prefs.c:947
 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 "
@@ -3963,25 +4039,25 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Scanner Compl�ter Tag - Conversion de Caract�res"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 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:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Convertir les espaces ' ' par des underscores '_'"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -3990,11 +4066,11 @@ msgstr ""
 "� partir du scanner de tags."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Scanner Renommer Fichier - Conversion de Caract�res"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4003,19 +4079,19 @@ msgstr ""
 "� partir du scanner de fichiers."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 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:1001
+#: src/prefs.c:1034
 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:1005
+#: src/prefs.c:1038
 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 "
@@ -4028,15 +4104,15 @@ msgstr ""
 "'Text in an Entry' au lieu de 'Text In An Entry')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Fen�tre du Scanner"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Ouvrir la Fen�tre du Scanner au d�marrage"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4044,11 +4120,11 @@ msgstr ""
 "Activer cette option pour ouvrir automatiquement la fen�tre des scanners au "
 "d�marrage de EasyTAG."
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Fen�tre du scanner toujours au dessus"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4057,16 +4133,16 @@ msgstr ""
 "fen�tre principale (toujours visible)."
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "Champs"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Ecraser les champs lors d'un Scan du tag"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4075,11 +4151,11 @@ msgstr ""
 "champs, par le nouveau. Si d�sactiv�, seulement les champs vides seront "
 "compl�t�s."
 
-#: src/prefs.c:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "Mettre ce texte en commentaire par d�faut :"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4088,13 +4164,13 @@ msgstr ""
 "commentaire du tag lors de l'utilisation du scanner 'Compl�ter le Tag'."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 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:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4105,42 +4181,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "Base de donn�es CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 msgid "Server Settings for Automatic Search"
 msgstr "Param�tres du Serveur pour la Recherche Automatique"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "Nom :"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "Chemin CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 msgid "Server Settings for Manual Search"
 msgstr "Param�tres du Serveur pour la Recherche Manuelle"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 msgid "Local CD Data Base"
 msgstr "Base de donn�es CD locale"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 msgid "Path :"
 msgstr "Chemin :"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4152,52 +4228,52 @@ msgstr ""
 "'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' et 'misc'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Param�tres du Proxy"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Utiliser un proxy"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Active les param�tres du serveur proxy."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "Nom d'H�te :"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Nom du proxy."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Port du proxy."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "Nom d'Utilisateur :"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "Nom de l'utilisateur sur le serveur proxy."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "Mot de Passe Utilisateur :"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 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:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "Liste des Noms de Pistes"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4205,7 +4281,7 @@ msgstr ""
 "S�lectionner le fichier audio correspondant (d'apr�s la position ou "
 "l'algorithme DLM si activ� en dessous)"
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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."
@@ -4215,7 +4291,7 @@ msgstr ""
 "s�lectionn�."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4227,15 +4303,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Confirmer la sortie du programme"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4243,53 +4319,57 @@ 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:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "Confirmer l'�criture du tag du fichier"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "Confirmer pour renommer les fichiers"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "Confirmer l'effacement des fichiers"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "Confirmer l'�criture de la liste de lecture"
 
-#: src/prefs.c:1389
+#. 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:1422
 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:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "Fermer cette fen�tre sans sauver"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 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:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Exemple : %.*d_-_Piste_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "Changements appliqu�s"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "Configuration sauv�e"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "Configuration inchang�e"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4300,11 +4380,11 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "Ce n'est pas un r�pertoire"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Le programme de lecture audio '%s' n'a pas �t� trouv�!"
@@ -4321,16 +4401,16 @@ msgstr "Renommer le Fichier et le R�pertoire"
 msgid "Process Fields"
 msgstr "Traiter Champs"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "Tag scann� avec succ�s..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Tag scann� avec succ�s...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4338,23 +4418,23 @@ msgstr ""
 "Scanner de tags : �trange..., l'extension '%s' n'a pas �t� trouv�e dans le "
 "nom de fichier '%s'!"
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, 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:660
+#: src/scan.c:663
 #, 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:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "Nouveau nom de fichier scann� avec succ�s..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nouveau nom de fichier scann� avec succ�s...(%s)"
@@ -4362,41 +4442,41 @@ msgstr "Nouveau nom de fichier scann� avec succ�s...(%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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "Scanner de Tag et de Nom du Fichier"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Scanner : "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "S�lectionner le type du scanner � utiliser"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Ouvrir fen�tre de Scan / Scanner le(s) fichier(s) s�lectionn�(s)"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Options du Scanner"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Montrer / Cacher l'Editeur de Masques"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Montrer / Cacher la L�gende"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "Fermer cette fen�tre"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4405,15 +4485,15 @@ msgstr ""
 "analyser le nom du fichier et le chemin, afin de compl�ter les champs du tag."
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "Apercu du scanner de tag..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr "Pr�fixer le masque avec le chemin courant"
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4426,15 +4506,15 @@ msgstr ""
 "sinon d'un chemin relatif par rapport � l'ancien."
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "Apercu du renommeur de fichiers..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Champs:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4443,126 +4523,126 @@ msgstr ""
 "S�lectionnez ceux qui vous int�ressent."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 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:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "Traiter le champ du titre"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "Traiter le champ de l'artiste"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Traiter le champ de l'album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "Traiter le champ du genre"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "Traiter le champ du commentaire"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Traiter le champ du compositeur"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "Ao"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 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:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Traiter le champ du copyright"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 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:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "Traiter le champ du nom de l'encodeur"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Inverser la s�lection"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Tout (D�)S�lectionner."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Convertir '_' et '%20' par ' '"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Convertir :"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "par : "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4570,7 +4650,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:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4578,11 +4658,14 @@ 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:2171
-msgid "Replace a character by an other one."
-msgstr "Remplacer un caract�re par un autre"
+#: src/scan.c:2287
+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:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4590,7 +4673,7 @@ msgstr ""
 "Toutes les lettres sont mises en majuscules (exemple, avant : 'Text IN AN "
 "entry', apr�s : 'TEXT IN AN ENTRY')."
 
-#: src/scan.c:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4598,7 +4681,7 @@ msgstr ""
 "Toutes les lettres sont mises en minuscules (exemple, avant : 'Text IN AN "
 "entry', apr�s : 'text in an entry')."
 
-#: src/scan.c:2209
+#: src/scan.c:2325
 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'."
@@ -4607,7 +4690,7 @@ msgstr ""
 "majuscule et minuscules (exemple, avant : 'text IN An ENTRY', apr�s : 'Text "
 "in an entry')."
 
-#: src/scan.c:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4615,15 +4698,15 @@ 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:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Ins�rer un espace avant une majuscule"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "Effacer les espaces ou underscores dupliqu�s"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4631,7 +4714,7 @@ msgstr ""
 "Tous les espaces sont supprim�s (exemple, avant: 'Text In An Entry', apr�s: "
 "'TextInAnEntry')."
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4639,7 +4722,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:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4650,183 +4733,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "L�gende"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artiste"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : commentaire"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p : compositeur"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r : copyright:"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : n� disque"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : encod� par"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genre"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignor�"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : nombre de pistes"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : artiste orig."
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : piste"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : titre"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : ann�e"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Editeur de Masque"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "Cr�er un Nouveau Masque"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Monter ce Masque"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Descendre ce Masque"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Dupliquer le Masque"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Ajouter les Masques par D�faut"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "Effacer le Masque"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Sauver les Masques"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "Nouveau_masque"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "Copier: Ancune ligne s�lectionn�e!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "Effacer: Ancune ligne s�lectionn�e!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Monter: Ancune ligne s�lectionn�e!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Descendre: Ancune ligne s�lectionn�e!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, 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:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Impossible d'ouvrir le fichier de configuration '%s' (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "Chargement de la configuration par d�faut..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, 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:1264
+#: src/setting.c:1278
 #, 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:1344
+#: src/setting.c:1358
 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:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "Chargement des masques par d�faut pour 'Renommer Fichier' ..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Chargement des masques par d�faut pour 'Renommer le R�pertoire' ..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ERREUR: La variable d'environnement HOME n'est pas d�finie!"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ERREUR: Impossible de cr�er le r�pertoire '%s' (%s)!"
@@ -4911,6 +4994,34 @@ msgstr "Lecteur Audio : '%s'"
 msgid "EasyTAG settings dir: '%s'"
 msgstr "R�pertoire pour les param�tres EasyTAG : '%s'"
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Le chemin donn� est incorrect!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Sensible � la casse"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Remplacer un caract�re par un autre"
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Contenu du Fichier Charg� :"
+
+#~ msgid "Files Name List :"
+#~ msgstr "Liste des Noms des Fichiers :"
+
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(Support des fichiers MP3 activ� en utilisant : libid3tag %s)"
+
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(Support des tags ID3v2.3 activ� en utilisant : id3lib %d.%d.%d)"
+
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "Version du tag invalide"
 
diff --git a/po/he.gmo b/po/he.gmo
index 19e4156..55e749f 100644
--- a/po/he.gmo
+++ b/po/he.gmo
diff --git a/po/he.po b/po/he.po
index 2528273..cb0c477 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2007-06-13 08:59+0300\n"
 "Last-Translator: Yuval Hager <yuval@avramzon.net>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -16,195 +16,237 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
 "GTK+ interface makes tagging easier under GNU/Linux."
 msgstr ""
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(תרגום לגרמנית)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(תרגום לרוסית)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(תרגום להולנדית)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(תרגום לשוודית)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(תרגום להונגרית)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(תרגום לאיטלקית)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(תרגום ליפנית)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(תרגום לאוקראינית)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(תרגום לצ'כית)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(תרגום לספרדית)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(תרגום לפולנית)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(תרגום לרומנית)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(תרגום לדנית)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(תרגום ליוונית)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(תרגום לפורטוגזית ברזילאית)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(תרגום לבולגרית)"
 
-#: src/about.c:160
+#: src/about.c:171
 msgid "(Chinese translation)"
 msgstr "(תרגום לסינית)"
 
-#: src/about.c:161
+#: src/about.c:172
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(תרגום ליוונית)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(תרגום לגרמנית)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "הערה"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "אודות..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "אודות"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(קומפל: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(משתמש ב: GTK+ %d.%d.%d וכן id3lib %d.%d.%d)"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(ללא תמיכה ב MP3)"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "מחבר: %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(ללא תמיכה ב MP3)"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "דוא\"ל: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "אתר: "
 
-#: src/about.c:292
+#: src/about.c:328
+msgid "Description:"
+msgstr "תיאור:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "(ללא תמיכה ב MP3)"
 
-#: src/about.c:296
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
 #, c-format
-msgid "(MP3 file support disabled)"
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
 msgstr "(ללא תמיכה ב MP3)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "אין די זכרון"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(ללא תמיכה ב Ogg Vorbis)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(ללא תמיכה ב MP3)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(ללא תמיכה ב FLAC)"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
 msgstr "(ללא תמיכה ב MP4/AAC)"
 
-#: src/about.c:322
+#: src/about.c:460
 #, fuzzy
-msgid "(WavPack file support disabled)"
+msgid "WavPack file support"
 msgstr "(ללא תמיכה ב MP3)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "מחבר: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "דוא\"ל: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "אתר: "
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "תיאור:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "תודות"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "תרגומים:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "כללי:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "שינויים"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -537,7 +579,7 @@ msgstr "שנה שם תיקייה ..."
 msgid "Reload Directory"
 msgstr "טען תיקייה מחדש"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "עיין בתיקייה באמצעות ..."
 
@@ -682,7 +724,7 @@ msgstr "נבחר מיקום ברירת מחדל חדש לקבצים"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "אישור..."
 
@@ -694,86 +736,65 @@ msgstr ""
 "מספר קבצים שונו אך לא נשמרו...\n"
 "האם לשמור אותם לפני החלפת התיקיה?"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"המסלול שהוזן אינו תקף!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "שגיאה..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 msgid "<All albums>"
 msgstr "<כל האלבומים>"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "שגיאה: בחיפוש אחר %s, לא נמצא %s בעץ."
 
-#: src/browser.c:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "אמן"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# אלבומים"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# קבצים"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "אלבום"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "עבור לתיקיית אב"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "הכנס תיקייה לעיון"
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "עץ"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "אמן ואלבום"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "שנה שם לתיקייה"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "שנה שם תיקייה '%s' ל:"
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "השתמש במסכה:"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 msgid "If activated, it will use masks to rename directory."
 msgstr "אם מופעל, ישתמש במסכות לשינוי שם תיקייה."
 
-#: src/browser.c:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -781,21 +802,31 @@ msgstr ""
 "בחר או הכנס מסכה בעזרת הקודים (ראה מקרא בחלון הסורק) כדי לשנות את שם התיקיה "
 "מתוך שדות התגים."
 
-#: src/browser.c:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "מסכת סורק לא תקפה"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "תצוגה מקדימה של שינוי שם תיקייה..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "שגיאה..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "יש להכניס שם תיקייה!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr "לא ניתן להמיר '%s' לקידוד שם קובץ. אנא השתמש בשם אחר."
@@ -822,7 +853,7 @@ msgstr "לא ניתן להמיר '%s' לקידוד שם קובץ. אנא השת�
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -831,7 +862,7 @@ msgstr ""
 "לא ניתן לשנות את שם התיקיה כי השם כבר קיים!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -846,47 +877,47 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "שם התיקייה שונה"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "תוכנית להריץ :"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr "הכנס את שם התוכנית להרצה. התוכנית תקבל את התיקיה הנוכחית כפרמטר."
 
-#: src/browser.c:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "פתח קובץ באמצעות ..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr "הכנס את שם התוכנית להרצה. התוכנית תקבל את שם הקובץ הנוכחי כפרמטר."
 
-#: src/browser.c:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "יש להניס שם תוכנית"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "לא ניתן למצוא את התוכנית '%s'!"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "לא ניתן להריץ את %s (שגיאה %d)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "לא ניתן לפצל תהליך חדש!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "הפקודה שהורצה: '%s %s'"
@@ -974,7 +1005,7 @@ msgstr "חפש ב :"
 msgid "All Fields"
 msgstr "כל השדות"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "אחר"
 
@@ -1049,7 +1080,7 @@ msgstr " סיווגים"
 msgid "Results :"
 msgstr "תוצאות :"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "חיפוש :"
 
@@ -1077,7 +1108,7 @@ msgstr "בטל בחירה לכל השורות"
 msgid "Invert lines selection"
 msgstr "הפוך בחירת שורות"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "בחר את כל השורות"
 
@@ -1101,15 +1132,15 @@ msgstr "קבע כ :"
 msgid "All"
 msgstr "הכל"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "שם קובץ"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "כותרת"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "שנה"
 
@@ -1121,12 +1152,12 @@ msgstr "מספר רצועה"
 msgid "# Tracks"
 msgstr "מספר רצועות"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "ז'אנר"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "הרץ את הסורק הנוכחי לכל קובץ"
 
@@ -1138,7 +1169,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1151,86 +1182,86 @@ msgstr ""
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "העלה את השורות שנבחרו או כל השורות (אם לא נבחרה אף שורה)."
 
-#: src/cddb.c:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "מוכן לחיפוש..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, 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:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "הפוך בחירה"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "מיין לפי מספר רצועה"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "מיון לפי שם רצועה"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "מחפש מארח '%s' ..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "לא מצאתי את המארח '%s' (%s)!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "לא מצליח לייצר socket חדש (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "מתחבר לשרת '%s', פורט '%d' ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "לא מצליח להתחבר לשרת '%s' (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "מחובר לשרת '%s'"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "מקבל מידע (%s) ..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "שגיאה בקריאת תשובת CDDB (%s)!"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "לא ניתן ליצור קובץ '%s' (%s)"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "לא ניתן לפתוח קובץ '%s' (%s)"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "שולח בקשה ..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "לא ניתן לשלוח בקשה (%s)!"
@@ -1239,89 +1270,89 @@ msgstr "לא ניתן לשלוח בקשה (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "מקבל נתונים ..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 msgid "The server returned a wrong answer!"
 msgstr "השרת החזיר תשובה לא נכונה!"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "השרת החזיר תשובה לא נכונה! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr "סליחה, אל החיפוש מבוסס הרשת כרגע לא פעיל!"
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "נמצאו %d אלבומ(ים) מתאימ(ים)"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "מקבל נתונים עבור עמוד %d ..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "מקבל נתונים עבור עמוד %d ..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr "העלאת תוצאות נוספות ..."
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d קבצים נבחרו!"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 msgid "Local CD search..."
 msgstr "חיפוש CD מקומי..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr ""
 
-#: src/cddb.c:3231
+#: src/cddb.c:3268
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "נמצאו %d אלבומים מתאימים למזהה דיסק '%s'"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "לא ניתן להעלות קובץ: '%s' (%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "מעלה את רשימת הרצועות באלבום"
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1330,7 +1361,7 @@ msgid ""
 "Do you want to continue ?"
 msgstr ""
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "כתוב תג מתוך בסיס הנתונים..."
 
@@ -1602,11 +1633,11 @@ msgstr ""
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr ""
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, שכבה ?"
 
@@ -1614,7 +1645,7 @@ msgstr "?, שכבה ?"
 msgid "Bitrate:"
 msgstr "קצב:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? קילוביט לשניה"
 
@@ -1622,17 +1653,17 @@ msgstr "? קילוביט לשניה"
 msgid "Freq:"
 msgstr "תדר:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? הרץ"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "מצב:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1811,13 +1842,13 @@ msgid "Tag selected files with these pictures"
 msgstr "תייג את הקבצים הנבחרים עם תמונות אלה"
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
-msgstr "מחק תמונות נבחרות, או את כולן."
-
-#: src/easytag.c:1051
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "הוסף תמונות לתג (ניתן גם לגרור תמונות לכאן)."
 
+#: src/easytag.c:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "מחק תמונות נבחרות, או את כולן."
+
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "שמור את התמונות שנבחרו לדיסק הקשיח."
@@ -2189,7 +2220,7 @@ msgstr "מוחק קובץ..."
 msgid "File '%s' deleted"
 msgstr "קובץ '%s' נמחק"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2201,109 +2232,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "החיפוש מתבצע..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "קובץ: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "נמצאו %d קבצים בתיקייה זו ובתיקיות המשנה שלה."
 
-#: src/easytag.c:3235
+#: src/easytag.c:3239
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "נמצאו %d קבצים בתיקייה זו."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u קבצים"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr "לא נמצאו קבצים בתיקייה זו ובתיקיות המשנה שלה!"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "לא נמצאו קבצים בתיקייה זו!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "מחפש..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "עצור את החיפוש..."
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "בחר תיקייה לעיון!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "תייג את הקבצים שנבחרו בשדה זה"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "המר '_' ו '%20' לרווחים"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "המר ' ' ל '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "הכל באותיות גדולות"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "הכל באותיות קטנות"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "אות ראשונה גדולה"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "אות ראשונה גדולה בכל מילה"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "מחק רווחים"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "הכנס רווח לפני אות גדולה"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 msgid "Remove duplicate spaces or underscores"
 msgstr "מחק רווחים או קוים תחתונים כפולים"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: יציאה לא מסודרת! (מספר תהליך: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, c-format
-msgid "Received signal %s (%d)"
-msgstr "התקבל סיגנל %s (%d)"
+msgid "Received signal %s (%d)\a"
+msgstr "התקבל סיגנל %s (%d)\a"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2313,11 +2344,12 @@ msgstr ""
 "'gdb easytag core' ואז 'bt' ואז 'l') ומידע על איך לשחזר את התקלה ל "
 "easytag@gmail.com"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "סיגנל לא מוכר"
 
-#: src/easytag.c:4466
+#: src/easytag.c:4479
+#, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2330,17 +2362,16 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: יציאה מסודרת."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2348,7 +2379,7 @@ msgstr ""
 "חלק מהקבצים שונו אך לא נשמרו...\n"
 "האם ברצונך לשמור אותם לפני הסיום?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr "האם אתה באמת רוצה לסיים את מהתוכנית?"
 
@@ -2442,7 +2473,7 @@ msgid ""
 "(Try setting the environment variable G_FILENAME_ENCODING)."
 msgstr ""
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "תרגום שם קובץ"
 
@@ -2473,7 +2504,7 @@ msgstr "ערוצים:"
 #: src/flac_tag.c:140 src/flac_tag.c:741
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
-msgstr "שגיאה בפתיחת קובץ: '%s' כקובץ  FLAC (%s)."
+msgstr "שגיאה בפתיחת קובץ: '%s' כקובץ  FLAC (%s).\a"
 
 #: src/flac_tag.c:983 src/ogg_tag.c:752
 #, c-format
@@ -2610,173 +2641,173 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "קובץ מושחת..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr "יומן"
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr "בסדר"
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr "כן"
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr "לא"
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr "החל"
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr "שמור"
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr "בטל"
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr "סגור"
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr "כתוב"
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr "בצע"
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr "חפש"
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr "עיין..."
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "בחר תיקייה..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "בחר קובץ..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "Warning..."
 msgstr "אזהרה..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr "לא מוגדר נגן"
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "לא ניתן להריץ %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "בייטים"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "קילובייט"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "מגהבייט"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "ג'יגהבייט"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "טרהבייט"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "ייצר רשימת השמעה"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "שם רשימת ההשמעה מסוג M3U"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "השתמש בשם התיקייה"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "ערוך מסכות"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "אפשרויות רשימת השמעה"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "כלול רק את הקבצים הנבחרים"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 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:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "השתמש במסלול מלא לקבצים ברשימת ההשמעה"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 msgid "Use relative path for files in playlist"
 msgstr "השתמש במסלול יחסי לקבצים ברשימת ההשמעה"
 
 #. Create playlist in parent directory
-#: src/misc.c:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "צור רשימת השמעה בתיקיית האב"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "אם מופעל, רשימת ההשמעה תיוצר בתיקיית האב."
 
 #. DOS Separator
-#: src/misc.c:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "השתמש במפריד תיקייות של DOS"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr "אפשרות זו מחליפה את מפריד התיקיות של UNIX - '/' בזה של DOS - '\\'."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "תוכן רשימת ההשמעה"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "כתוב רק את רשימת הקבצים"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "כתוב מידע מתוך שם הקובץ"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "כתוב מידע מתוך:"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2785,12 +2816,12 @@ msgstr ""
 "קובץ רשימת ההשמעה '%s' כבר קיים!\n"
 "לשכתב?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "כתוב רשימת השמעה..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2799,121 +2830,158 @@ msgstr ""
 "לא ניתן לכתוב את קובץ רשימת ההשמעה '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "רשימת ההשמעה נכתבה '%s'"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "דיסק"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "רצועה"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "הערה"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "מלחין"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "אמן מקורי"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "זכויות"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "אתר"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "קודד ע\"י"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "חפש קובץ"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr "כתוב את המילה שברצונך לחפש בקבצים. אם לא תרשום כלום, יוחזרו כל הקבצים."
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "בתוך :"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "התג"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "הבחנה בין אותיות גדולות לקטנות"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "נמצאו: %d קבצים"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "העלה את שמות הקבצים מתוך קובץ TXT"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 msgid "File :"
 msgstr "קובץ :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " העלה"
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "תוכן הקובץ שהועלה :"
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "אישור שינוי שם לקובץ"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "הכנס רווח לפני אות גדולה"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "מחק שורה זו"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "רשימת שמות הקבצים :"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "מחק את כל השורות הריקות"
 
-#: src/misc.c:2828
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "כלול רק את הקבצים הנבחרים"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "כלול רק את הקבצים הנבחרים"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "טען מחדש"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "כתוב רק את רשימת הקבצים"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "בחר את כל השורות"
+
+#: src/misc.c:3016
 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:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "הכנס שורה ריקה"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "מחק שורה זו"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "מחק את כל השורות הריקות"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "הזז מסכה זו למעלה"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "טען מחדש"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "הזז מסכה זו למטה"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3048,121 +3116,121 @@ msgstr ""
 msgid "Save file..."
 msgstr "שמור קובץ..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "תמונת JPEG"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "תמונת PNG"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "תמונה לא מוכרת"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "צלמית PNG בגודל 32x32 פיקסלים"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "צלמית אחרת"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "עטיפה קדמית"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "עטיפה אחורית"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "עמוד חוברת"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "מדיה (למשל התוית על הדיסק)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "אומן מוביל/מבצע מוביל/מבצע סולו"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "אומן/מבצע"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr ""
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "להקה/תזמורת"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "כותב המילים"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "מיקום ההקלטה"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "בזמן ההקלטה"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "בזמן ההופעה"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "תמונת מתוך סרט"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "דג בצבעים בהירים"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "אילוסטרציה"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "לוגו של הלהקה/אומן"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "לוגו מפיץ/סטודיו"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "סוג תמונה לא ידוע"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "פיקסלים"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "סוג"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "תיאור"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
 msgstr ""
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "מעלה את קובץ התמונה..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3173,7 +3241,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "קובץ התמונה לא הועלה..."
 
@@ -3414,23 +3482,50 @@ msgid ""
 "the program (as 'xmms -p') before to receive files as other arguments."
 msgstr ""
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "אפשרויות תגים"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "במרכז החלון הראשי"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr "אם מופעל, רשימת ההשמעה תיוצר בתיקיית האב."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "הגדרות קבצים"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "אפשרויות קבצים"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr ""
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3439,52 +3534,52 @@ msgid ""
 msgstr ""
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "הפוך את סיומת הקובץ ל :"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "אותיות קטנות"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "לדוגמא, הסיומת תומר ל '.mp3'"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "אותיות גדולות"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "לדוגמא, הסיומת תהפוך ל '.MP3'"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "ללא שינוי"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "הסיומת לא תשתנה"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "שמר את זמן השינוי של הקובץ"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3495,47 +3590,47 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr "קידוד תוים לשם הקובץ"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
 msgstr ""
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "נסה קידוד אחר"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "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 ""
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
 "looking characters."
 msgstr ""
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3544,42 +3639,42 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "הגדרות תגים"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "אפשרויות תגים"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "השלמה אוטומטית של התאריך אם אינו שלם"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
 "1996, 95 => 1995, ...)."
 msgstr ""
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "רשום את שדה מספר הרצועה עם מספר הספרות הבא :"
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
 "'10',...). Else it keeps the 'raw' track value."
 msgstr ""
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr ""
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3588,17 +3683,17 @@ msgid ""
 "shown in XMMS, though."
 msgstr ""
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr ""
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr ""
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr ""
 
@@ -3606,32 +3701,32 @@ msgstr ""
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "הגדרות תגים מסוג ID3"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "חוקים לתגים מסוג ID3"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr ""
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
 msgstr ""
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr ""
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3640,65 +3735,65 @@ msgid ""
 msgstr ""
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr ""
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
 msgstr ""
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 #, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "כתוב תג ID3V2"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "קידוד תוים עבור תגי ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "כתוב תג ID3V2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "כתוב תג ID3V2"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 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:716
+#: src/prefs.c:748
 #, fuzzy
 msgid "Version:"
 msgstr "תיאור:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3707,76 +3802,76 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 #, fuzzy
 msgid "Unicode "
 msgstr "יוניקוד (UTF-8)"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "קודד ע\"י"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 msgid "Character set used to write the tag data in the file."
 msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 #, fuzzy
 msgid "No"
 msgstr "לא"
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "תג ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr ""
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 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:846
+#: src/prefs.c:878
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
 
 #. Character Set for reading tag
-#: src/prefs.c:878
+#: src/prefs.c:910
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "קידוד תוים עבור תגי ID3"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3793,59 +3888,59 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:914
+#: src/prefs.c:947
 msgid "Character set used to read tag data in the file."
 msgstr ""
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "סורק"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "סורק למילוי תגים - המרת תוים"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "המר קו תחתי '_' ואת המחרוזת '%20' לרווח - ' '"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "המר רווחים ' ' לקו תחתי '_'"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 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:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "סורק לשינוי שמות קבצים - המרת תוים"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 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:994
+#: src/prefs.c:1027
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "סורק לעיבוד שדות - המרת תוים"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1001
+#: src/prefs.c:1034
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1005
+#: src/prefs.c:1038
 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 "
@@ -3854,62 +3949,62 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "חלון הסורק"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "פתח את חלון הסורק באתחול"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr ""
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "חלון הסורק תמיד למעלה"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
 msgstr ""
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "שדות"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "שכתב שדות בסריקת תג"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "קבע את הטקסט הבא כהערת ברירת מחדל :"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 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:1072
+#: src/prefs.c:1105
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 
-#: src/prefs.c:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -3918,42 +4013,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "בסיס נתונים של הדיסקים"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 msgid "Server Settings for Automatic Search"
 msgstr ""
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "שם :"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "פורט :"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "מסלול CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 msgid "Server Settings for Manual Search"
 msgstr "הגדרות שרת לחיפוש ידני"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 msgid "Local CD Data Base"
 msgstr "חיפוש בבסיס נתונים מקומי"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 msgid "Path :"
 msgstr "מסלול :"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -3962,65 +4057,65 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "הגדרות פרוקסי"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "השתמש בפרוקסי"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr ""
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "שם מארח :"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "שם שרת הפרוקסי."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "הפורט של שרת הפרוקסי."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "שם משתמש :"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "שם המשתמש בשרת הפרוקסי."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "סיסמא :"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr "הסיסמא של המשתמש בשרת הפרוקסי."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "רשימת שמות רצועות"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4030,67 +4125,71 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "אישור"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "אישור לפני סיום התוכנית"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr "אם מופעל, פותח חלון לקבלת אישור לפני סיום התוכנית."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "אישור כתיבת תג לקובץ"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "אישור שינוי שם לקובץ"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "אישור מחיקת קובץ"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "אישור כתיבת רשימת השמעה"
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr "החל שינויים (אך אל תשמור) וסגור חלון זה"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "סגור חלון זה בלי לשמור"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 msgid "Save changes and close this window"
 msgstr "שמור שינויים וסגור חלון זה"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(דוגמא : %.*d_-_Track_name_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "השינויים הוחלו"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "ההגדרות נשמרו"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "ההגדרות לא השתנו"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4098,11 +4197,11 @@ msgid ""
 "(%s) "
 msgstr ""
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "לא תיקייה"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "לא ניתן למצוא את הנגן '%s'!"
@@ -4119,36 +4218,36 @@ msgstr "שנה שם קובץ ותיקייה"
 msgid "Process Fields"
 msgstr "עבד שדות"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "תגים נסרקו בהצלחה..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "תגים נסרקו בהצלחה...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr "סורק תגים: מוזר..., הסיומת '%s' לא נמצאה בקובץ '%s'!"
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "שגיאת סריקה: לא ניתן למצוא את המפריד '%s' בתוך '%s'"
 
-#: src/scan.c:660
+#: src/scan.c:663
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 
-#: src/scan.c:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "שם קובץ חדש נסרק בהצלחה..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "שם קובץ חדש נסרק בהצלחה...(%s)"
@@ -4156,41 +4255,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "סורק תגים ושמות קבצים"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "סורק:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "בחר את סוג הסורק לשימוש"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "פתח את חלון הסורק / סרוק את הקבצים שנבחרו"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "אפשרויות סורק"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "הצג / החבא את עורך המסכות"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "הצג / החבא מקרא"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "סגור חלון זה"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4199,15 +4298,15 @@ msgstr ""
 "למילוי שדות התגים."
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "תצוגה מקדימה של מילוי התגים..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4216,201 +4315,202 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "תצוגה מקדימה לשינוי השם..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "בחר שדות:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 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:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "ק"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "עבד את שדה שם הקובץ"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "כ"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "עבד את שדה הכותרת"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "או"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "עבד את שדה האומן"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "אל"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "עבד את שדה האלבום"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "ז"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "עבד את שדה הז'אנר"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "ה"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "עבד את שדה ההערה"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "מ"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "עבד את שדה המלחין"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "מק"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 msgid "Process original artist field"
 msgstr "עבד את שדה האומן המקורי"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "זכ"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "עבד את שדה הזכויות"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "את"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "עבד את שדה האתר"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "מק"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "עבד את שדה המקודד"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "הפוך בחירה"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "בחר/בטל הכל."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "המר '_' ו'%20' ל' '"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "המר:"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "אל:"
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 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:2169
+#: src/scan.c:2284
 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:2171
-msgid "Replace a character by an other one."
-msgstr "החלף תו בתו אחר."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 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:2206
+#: src/scan.c:2322
 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:2209
+#: src/scan.c:2325
 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:2212
+#: src/scan.c:2328
 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:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "הכנס רווח לפני אות גדולה"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "מחק רווחים או קוים תחתיים כפולים"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4419,183 +4519,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "מקרא"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : אומן"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : אלבום"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : הערה"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p : מלחין"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r : זכויות"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : מספר דיסק"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : מקודד ע\"י"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : ז'אנר"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignored"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : מספר הרצועות"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : אומן מקורי"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : רצועה"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : כותרת"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u : אתר"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : שנה"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "עורך מסכות"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "צור מסכה חדשה"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "הזז מסכה זו למעלה"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "הזז מסכה זו למטה"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "שכפל מסכה"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "הוסף מסכות ברירת מחדל"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "מחק מסכה"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "שמור מסכות"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr ""
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "העתקה: לא נבחרה שורה!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "מחיקה: לא נבחרה שורה!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "העלה: לא נבחרה שורה!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "הורד: לא נבחרה שורה!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
-msgstr "שגיאה: לא ניתן לכתוב לקובץ ההגדרות: %s (%s)"
+msgstr "שגיאה: לא ניתן לכתוב לקובץ ההגדרות: %s (%s)\a"
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "לא ניתן לפתוח קובץ הגדרות  '%s' (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "מעלה הגדרות ברירת מחדל..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "לא ניתן ליצור או לפתוח קובץ '%s' (%s)"
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
-msgstr "שגיאה: לא ניתן לכתוב רשימה לקובץ: %s (%s)"
+msgstr "שגיאה: לא ניתן לכתוב רשימה לקובץ: %s (%s)\a"
 
 #. Fall back to defaults
-#: src/setting.c:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "מעלה את מסכות ברירת המחדל למילוי תגים..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "מעלה את מסכות ברירת המחדל לשינוי שמות קבצים..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "מעלה את מסכות ברירת המחדל לשינוי תיקייה..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "שגיאה: משתנה הסביבה HOME אינו מוגדר"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "שגיאה: לא ניתן ליצור תיקייה '%s' (%s)!"
@@ -4678,6 +4778,36 @@ msgstr "נגן: '%s'"
 msgid "EasyTAG settings dir: '%s'"
 msgstr "תיקיית ההגדרות של EasyTag: '%s'"
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "המסלול שהוזן אינו תקף!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "הבחנה בין אותיות גדולות לקטנות"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "החלף תו בתו אחר."
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "תוכן הקובץ שהועלה :"
+
+#~ msgid "Files Name List :"
+#~ msgstr "רשימת שמות הקבצים :"
+
+#, fuzzy
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(ללא תמיכה ב MP3)"
+
+#, fuzzy
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(ללא תמיכה ב MP3)"
+
 #, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "גרסה לא תקפה של התג"
@@ -4708,8 +4838,8 @@ msgstr "תיקיית ההגדרות של EasyTag: '%s'"
 #~ msgid "Do nothing"
 #~ msgstr "אל תעשה כלום"
 
-#~ msgid "ERROR while opening file: '%s' (%s)"
-#~ msgstr "שגיאה בפתיחת הקובץ: '%s' (%s)"
+#~ msgid "ERROR while opening file: '%s' (%s)\a"
+#~ msgstr "שגיאה בפתיחת הקובץ: '%s' (%s)\a"
 
 #~ msgid "Load on startup the directory"
 #~ msgstr "טען את התיקייה בזמן עלייה"
diff --git a/po/hu.gmo b/po/hu.gmo
index 2696e25..2f40650 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index e8c2c87..319ff20 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag-1.99.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2006-12-28 22:10+0100\n"
 "Last-Translator: M�sz�ros Csaba\n"
 "Language-Team:  <hu@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
@@ -30,188 +30,230 @@ msgstr ""
 "Sz�l Mikl�s <mukka@freemail.hu>\n"
 "M�sz�ros Csaba <csablak@freemail.hu>"
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(N�met ford�t�s)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(Orosz ford�t�s)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(Holland ford�t�s)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(Sv�d ford�t�s)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(Magyar ford�t�s)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(Olasz ford�t�s)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(Jap�n ford�t�s)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(Ukr�n ford�t�s)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(Cseh ford�t�s)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(Spanyol ford�t�s)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(Lengyel ford�t�s)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(Rom�n ford�t�s)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(D�n ford�t�s)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(G�r�g ford�t�s)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Brazil �s Portug�l ford�t�s)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(Bulg�r ford�t�s)"
 
-#: src/about.c:160
+#: src/about.c:171
 msgid "(Chinese translation)"
 msgstr "(K�nai ford�t�s)"
 
-#: src/about.c:161
+#: src/about.c:172
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(G�r�g ford�t�s)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(N�met ford�t�s)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Megjegyz�s"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "N�vjegy..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "N�vjegy"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(K�sz�lt: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(gtk+ %d.%d.%d �s id3lib %d.%d.%d)"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(MP3 f�jl t�mogat�s nem el�rhet�)"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "Szerz�: %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(MP3 f�jl t�mogat�s nem el�rhet�)"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "E-mail: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Honlap: "
 
-#: src/about.c:292
+#: src/about.c:328
+msgid "Description:"
+msgstr "Le�r�s:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "(MP3 f�jl t�mogat�s nem el�rhet�)"
 
-#: src/about.c:296
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
 #, c-format
-msgid "(MP3 file support disabled)"
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
 msgstr "(MP3 f�jl t�mogat�s nem el�rhet�)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "Nincs el�g mem�ria"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(Ogg Vorbis f�jl t�mogat�s nem el�rhet�)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(MP3 f�jl t�mogat�s nem el�rhet�)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(FLAC f�jl t�mogat�s nem el�rhet�)"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
 msgstr "(MP4/AAC f�jl t�mogat�s nem el�rhet�)"
 
-#: src/about.c:322
+#: src/about.c:460
 #, fuzzy
-msgid "(WavPack file support disabled)"
+msgid "WavPack file support"
 msgstr "(MP3 f�jl t�mogat�s nem el�rhet�)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "Szerz�: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-mail: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Honlap: "
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "Le�r�s:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "K�sz�net"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "Ford�t�sok:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "�ltal�nos:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "M�dos�t�sok"
 
-#: src/about.c:455
+#: src/about.c:560
 #, fuzzy, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "'%s' (%s) f�jl megnyit�sa sikertelen!"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
 #: src/ape_tag.c:74 src/et_core.c:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -587,7 +629,7 @@ msgid "Reload Directory"
 msgstr "K�_nyvt�r �jrat�lt�se"
 
 # b�ng�sz� men�
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "K�n_yvt�r b�ng�sz�s k�ls� programmal..."
 
@@ -753,7 +795,7 @@ msgstr "�j alap�rtelmezett k�nyvt�r kiv�lasztva"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Figyelem1x"
 
@@ -765,88 +807,67 @@ msgstr ""
 "N�h�ny f�jl megv�ltozott\n"
 "Szeretn� menteni a v�ltoz�sokat?"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"A megadott el�r�si �t helytelen:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "Hiba!"
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 msgid "<All albums>"
 msgstr "<Minden albums>"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, 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:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "El�ad�"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# Albumok"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# F�jlok"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Ugr�s a sz�l� k�nyvt�rba"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Adja meg az �tvizsg�land� k�nyvt�rat."
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Fastrukt�ra"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "El�ad� & Album"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "K�nyvt�r �tnevez�se"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "%s - k�nyvt�r �tnevez�se"
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "Haszn�land� maszk :"
 
 # bubblehelp
-#: src/browser.c:3217
+#: src/browser.c:3244
 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:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -854,21 +875,31 @@ msgstr ""
 "V�lassza ki a megfelel� maszkot, vagy �rjon egy �jat a k�nyvt�r "
 "�tnevez�s�hez."
 
-#: src/browser.c:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "Hib�s feldolgoz�maszk"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "K�nyvt�r �tnevez�s el�n�zet..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Hiba!"
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "Meg kell adnia a k�nyvt�r nev�t!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -896,7 +927,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -905,7 +936,7 @@ msgstr ""
 "Az �tnevez�s sikertelen. Ez a n�v m�r l�tezik!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -919,52 +950,52 @@ msgstr ""
 "Erre: '%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "K�nyvt�r �tnevezve"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Futtatand� program:"
 
 # bubble help?
-#: src/browser.c:3645
+#: src/browser.c:3672
 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:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "Megnyit�s ezzel..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 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:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "Meg kell adnia a program nev�t!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "A %s program nem tal�lhat�!"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "'%s'-t nem lehet futtatni. %d hiba!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "Egy m�sik folyamatot nem siker�lt lev�lasztani!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "A futtatott parancs : '%s %s'"
@@ -1052,7 +1083,7 @@ msgstr "Ahol keres:"
 msgid "All Fields"
 msgstr "Minden mez�ben"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Egy�b"
 
@@ -1127,7 +1158,7 @@ msgstr "Kateg�ri�k"
 msgid "Results :"
 msgstr "Eredm�nyek"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "Keresend� elem:"
 
@@ -1157,7 +1188,7 @@ msgstr "Kijel�l�s megsz�ntet�se"
 msgid "Invert lines selection"
 msgstr "Kijel�l�s megford�t�sa"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "Minden sor kijel�l�se"
 
@@ -1182,15 +1213,15 @@ msgstr "Lek�r�s tartalma"
 msgid "All"
 msgstr "MInden mez�"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "F�jl neve"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "C�m"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "�v"
 
@@ -1202,12 +1233,12 @@ msgstr "S�v #"
 msgid "# Tracks"
 msgstr "# S�v"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "M�faj"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Az aktu�lis feldolgoz� futtat�sa a kijel�lt f�jlokon"
 
@@ -1219,7 +1250,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1237,87 +1268,87 @@ msgstr ""
 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:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Keres�sre k�sz..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, 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:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Kijel�l�s megford�t�sa"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Lista rendez�se sorsz�m szerint"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Rendez�s n�v szerint"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "%s n�v felold�sa"
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "'%s' (%s) n�vfelold�sa sikertelen!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "(%s) l�trehoz�sa sikertelen!"
 
 #. Open connection to the server
-#: src/cddb.c:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Kapcsol�d�s ide '%s', port '%d' ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Sikertelen kapcsol�d�s a '%s' (%s) helyhez!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Kapcsol�d�s a %s szerverhez"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Adatok fogad�sa (%s)"
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Hib�s v�lasz a (%s) cddb leh�v�sakor!"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "A '%s' (%s) f�jl l�trehoz�sa sikertelen."
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "'%s' (%s) f�jl megnyit�sa sikertelen!"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "K�r�s k�ld�se"
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "(%s) k�r�s k�ld�se sikertelen!"
@@ -1326,90 +1357,90 @@ msgstr "(%s) k�r�s k�ld�se sikertelen!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "Adatok fogad�sa..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 msgid "The server returned a wrong answer!"
 msgstr "A szerver hib�s v�laszt k�ld�tt!"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "A szerver (%s) hib�s v�laszt k�ld�tt!"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 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:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "%d darab egyez� albumot tal�ltam."
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Adatok fogad�sa (%d)"
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Adatok fogad�sa (%d)"
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr "Tov�bbi eredm�nyek let�lt�se"
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d f�jl kijel�lve!"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Keres�sre k�sz..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, 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:3231
+#: src/cddb.c:3268
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "%d darab egyez� albumot tal�ltam."
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, fuzzy, 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:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "Az album sz�mc�meinek bet�lt�se ..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1422,7 +1453,7 @@ msgstr ""
 "\n"
 "Folytatja?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "C�mke �r�sa CDDB-b�l..."
 
@@ -1738,11 +1769,11 @@ msgstr "Hib�s f�jlhivatkoz�s"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, R�teg ?"
 
@@ -1750,7 +1781,7 @@ msgstr "?, R�teg ?"
 msgid "Bitrate:"
 msgstr "Bit�rt�k:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1758,17 +1789,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Frekvencia:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "M�d:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1982,14 +2013,14 @@ msgstr ""
 "A kijel�lt f�jlok megc�mk�z�se a megadott k�ppel"
 
 #: src/easytag.c:1045
+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:1051
 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:1051
-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:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "Kijel�lt k�p(ek) ment�se a merevlemezre."
@@ -2355,7 +2386,7 @@ msgstr "F�jl t�rl�se..."
 msgid "File '%s' deleted"
 msgstr "'%s' f�jl t�r�lve"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2366,109 +2397,109 @@ msgstr ""
 "(%s)k�nyvt�r nem olvashat�."
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "Beolvas�s..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "F�jl: %s"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, 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:3235
+#: src/easytag.c:3239
 #, 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:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u f�jl"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 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:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "Nem tal�lhat� f�jl ebben a k�nyvt�rban!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Bet�lt�s"
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "Bet�lt�s le�ll�t�sa"
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "Adja meg az �tvizsg�land� k�nyvt�rat!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "A kijel�lt f�jlok megc�mk�zve a megadott mez�kkel"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Als�von�s �s '%20' sztring sz�k�zz� alak�t�sa"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "Sz�k�z als�von�ss� alak�t�sa"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "MINDENT NAGYBET�SRE"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "mindent kisbet�sre"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "Els� bet� legyen nagybet�"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "Minden Sz� Els� Bet�je Legyen Nagybet�"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "Sz�k�z�k elt�vol�t�sa"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Sz�k�z minden nagybet� el�"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 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:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: rendellenes kil�p�s! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, fuzzy, c-format
-msgid "Received signal %s (%d)"
+msgid "Received signal %s (%d)\a"
 msgstr "%s (%d) szign�l keletkezett!\n"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2479,11 +2510,12 @@ msgstr ""
 "el)\n"
 "<easytag@gmail.com> c�mre."
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Ismeretlen szign�l"
 
-#: src/easytag.c:4466
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2496,8 +2528,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2518,11 +2549,11 @@ msgstr ""
 "\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Norm�lis kil�p�s."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2530,7 +2561,7 @@ msgstr ""
 "N�h�ny f�jl megv�ltozott\n"
 "Szeretn� menteni a v�ltoz�sokat?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr " Biztosan ki akar l�pni? "
 
@@ -2629,7 +2660,7 @@ msgstr ""
 "(Pr�b�lja meg a k�rnyezetet vari�lni:\n"
 " G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "F�jln�v ford�t�sok (?)"
 
@@ -2800,123 +2831,123 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "Hib�s f�jl..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " OK "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " Igen "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " Nem "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " Alkalmaz "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " Ment "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " M�gsem "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " Bez�r "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " �r�s "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " Futtat�s "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr "Keres�s "
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr "Tall�z..."
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "K�nyvt�r kiv�laszt�sa..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "F�jl kiv�laszt�sa..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 #, fuzzy
 msgid "Warning..."
 msgstr "Bet�lt�s"
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, 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:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "M3u listaf�jl k�sz�t�s"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "M3U listaf�jl neve"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "K�nyvt�r nev�nek haszn�lata"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Maszkok szerkeszt�se"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "M3u listaf�jl be�ll�t�sok"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Csak a kijel�lt f�jlokat tartalmazza"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2924,31 +2955,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:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "Teljes el�r�si �t haszn�lata az m3u list�ban"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 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:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "M3u listaf�jl �r�sa a sz�l� k�nyvt�rba"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 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:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "Dos-Windows f�le k�nyvt�r elv�laszt� haszn�lata"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2956,23 +2987,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:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "M3u listaf�jl tartalma"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "Csak lista k�sz�t�se a f�jlokr�l"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "Inform�ci� �r�s a f�jlnevet haszn�lva"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Inform�ci� �r�s ezt a maszkot haszn�lva:"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2981,12 +3012,12 @@ msgstr ""
 "'%s' listaf�jl m�r l�tezik!\n"
 "Fel�l�rja?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "M3u listaf�jl �r�sa..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2995,103 +3026,138 @@ msgstr ""
 "A '%s' listaf�jl �r�sa sikertelen!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "'%s' listaf�jl elk�sz�lt"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "S�v"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Megjegyz�s"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "Szerz�"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "Eredeti el�ad�"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Kiad�"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "URL"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "K�dol�"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "F�jlkeres�s"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 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:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "Hol keressen?"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "c�mk�ben"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "kis �s NAGYBET�K megk�l�nb�ztet�se"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "%d darab tal�lat"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "F�jlnevek bet�lt�se TXT f�jlb�l"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 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:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " Bet�lt "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "F�jl tartalma bet�ltve:"
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "F�jl �tnevez�s�nek meger�s�t�se"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "Sz�k�z besz�r�sa minden NAGYBET�S sz� el�"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "F�jlok neveinek list�ja:"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Sor t�rl�se"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+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:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "Csak a kijel�lt f�jlokat tartalmazza"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "Csak a kijel�lt f�jlokat tartalmazza"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "�jrat�lt�s"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Csak lista k�sz�t�se a f�jlokr�l"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Minden sor kijel�l�se"
 
 # bubble help
-#: src/misc.c:2828
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3100,21 +3166,23 @@ msgstr ""
 "aktu�lis be�ll�t�saival �r�dnak fel�l.\n"
 "(A feldolgoz�ablak most nyitva)."
 
-#: src/misc.c:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "�res sor besz�r�sa"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "Sor t�rl�se"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "Minden �res sor t�rl�se"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Maszk felfel� mozgat�sa"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "�jrat�lt�s"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Maszk lefel� mozgat�sa"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3249,122 +3317,122 @@ msgstr ""
 msgid "Save file..."
 msgstr "F�jl ment�se..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "JPEG"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "PNG"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "Ismeretlen form�tum"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 pixeles PNG ikon"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "Egy�b ikon"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "Els� bor�t�"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "H�ts� bor�t�"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "Bels� lap"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "CD korong f�nyk�p"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "Sorsz�m - el�ad�"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "Szerz� - el�ad�"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "Karmester"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "Banda - Zenekar"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "Dalsz�veg - sz�veg�r�"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "Felv�tel helysz�ne"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "Felv�tel k�zben"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "El�ad�s k�zben"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "Film - Video felv�tel"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "Egy f�nyes sz�nes hal"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "Illusztr�ci�"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "Banda - El�ad� log�ja"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "Kiad� - st�di� log�ja"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "Ismeretlen k�p t�pus"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "k�ppont"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "T�pus"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "Le�r�s"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
 msgstr ""
 "A k�p megjelen�t�se nem lehets�ges mert t�l kev�s adat �ll rendelkez�sre."
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "K�p bet�lt�se..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3374,7 +3442,7 @@ msgstr ""
 "'%s' (%s) f�jl megnyit�sa sikertelen!\n"
 " "
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "K�p bet�lt�se sikertelen..."
 
@@ -3637,26 +3705,55 @@ msgid ""
 "the program (as 'xmms -p') before to receive files as other arguments."
 msgstr "Alap�rtelmezett param�terezhet� zenelej�tsz� program. (pl. 'xmms -p') "
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "  "
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "A f�ablak k�zep�n"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+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)"
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
 # Men�sor
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "F�jln�v be�ll�t�sok"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "  "
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr ""
 "Szab�lytalan karakterek cser�je a f�jlnevekben (Windows �s CD-Rom sz�m�ra)"
 
 # bubble help
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3669,56 +3766,56 @@ msgstr ""
 "haszn�lva nevezz�k �t a f�jlokat a feldolgoz�val."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "F�jln�v kiterjeszt�s �talak�t�sa:"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "kisbet�sre"
 
 # bubble help
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "P�ld�ul: f�jln�v.mp3"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "NAGYBET�SRE"
 
 # bubble help
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "P�ld�ul: f�jln�v.MP3"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "Nincs v�ltoztat�s"
 
 # bubble help
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "A kiterjeszt�s nem v�ltozik"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "A f�jl eredeti d�tum�nak v�delme"
 
 # bubble help
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr "A f�jl eredeti d�tuma nem v�ltozik ment�skor."
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3729,24 +3826,24 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr ""
 "Karakterk�szlet be�ll�t�sa a f�jln�vhez, ha valamely karakter nem �rhat� a "
 "rendszer be�ll�t�sok miatt."
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
 msgstr "  "
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "Pr�b�lja meg m�sik karakter k�dol�ssal"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
@@ -3757,12 +3854,12 @@ msgstr ""
 "(P�ld�ul: ISO-8859-1-fr; KOI8-R-ru; ISO-8859-2-hu)\n"
 "Ha ez nem siker�l, akkor ISO-8859-1-be k�dol."
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 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:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3772,13 +3869,13 @@ msgstr ""
 "tal�lhat� meg az adott karakter, akkor 1 vagy t�bb hasonl� form�j� karaktert "
 "pr�b�l beilleszteni helyette."
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr "A rendszerk�dol�s haszn�lata, �s a nem megfelel� karakterek eldob�sa"
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3789,21 +3886,21 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "C�mke be�ll�t�sok"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "  "
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "�v automatikus kieg�sz�t�se, ha hi�nyos"
 
 # bubble help
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3812,12 +3909,12 @@ msgstr ""
 "Megpr�b�lja kieg�sz�teni az �v mez�t, ha csak egyjegy� sz�m �ll "
 "rendelkez�sre."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "A sorsz�m mez�t kit�lt� sz�mok form�tuma (1, 01, 001)"
 
 # bubble help
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3826,12 +3923,12 @@ msgstr ""
 "Egyjegy� sz�moz�s: 1,2,3 - �rjon be 1-est.\n"
 "K�tjegy� sz�moz�s:01,02,03 - �rjon be 2-est."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Ogg Vorbis f�jlok eset�n XMMS form�tumba is �rjon megjegyz�st"
 
 # bubble help
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3846,17 +3943,17 @@ msgstr ""
 "programok ne panaszkodjanak egy ismeretlen mez� miatt. A megjegyz�sek nem "
 "fognak l�tszani az XMMS-ben."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr "C�mkemez�k feldolgoz�sa eset�n a Page Up/Page Down gombok viselked�se:"
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr "A f�kuszt ugyanazon a mez�n tartja"
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr "A f�kusz mindig a (M� c�me)-re ugrik."
 
@@ -3864,23 +3961,23 @@ msgstr "A f�kusz mindig a (M� c�me)-re ugrik."
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "ID3 c�mke be�ll�t�sok"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "  "
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 #, fuzzy
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "ID3 c�mke �r�sa FLAC f�jlba FLAC c�mk�vel"
 
 # bubble help
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3889,12 +3986,12 @@ msgstr ""
 "Ellenkez� esetben a c�mkemez�k tartalma t�rl�dik."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "C�mke tartalm�nak t�rl�se ha minden mez� �resre van �ll�tva"
 
 # bubble help
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3907,55 +4004,55 @@ msgstr ""
 "�resre vannak �ll�tva."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Automatikus konvert�l�s a r�gi ID3v2 c�mk�b�l"
 
 # bubble help
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
 msgstr "Automatikus konvert�l�s a r�gi ID3v2 c�mk�b�l az �j ID3v2.3-verzi�ra."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 #, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "ID3v2.x c�mke �r�sa"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Karakterk�szlet az ID3 c�mk�khez"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "ID3v2.x c�mke �r�sa"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "ID3v2.x c�mke �r�sa"
 
 # bubble help
-#: src/prefs.c:709
+#: src/prefs.c:741
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3966,12 +4063,12 @@ msgstr ""
 "Ellenkez� esetben a c�mkemez�k tartalma t�rl�dik."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 #, fuzzy
 msgid "Version:"
 msgstr "Le�r�s:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3980,60 +4077,60 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 # src/trans.h:267
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "K�dol�"
 
 # bubble help
-#: src/prefs.c:776
+#: src/prefs.c:808
 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:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 #, fuzzy
 msgid "No"
 msgstr " Nem "
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ID3 c�mk�k"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "ID3v1.x c�mke �r�sa"
 
 # bubble help
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4043,23 +4140,23 @@ msgstr ""
 "Ellenkez� esetben a c�mkemez�k tartalma t�rl�dik."
 
 # bubble help
-#: src/prefs.c:846
+#: src/prefs.c:878
 #, fuzzy
 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:878
+#: src/prefs.c:910
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Karakterk�szlet az ID3 c�mk�khez"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -4077,7 +4174,7 @@ msgid ""
 msgstr "Ez a karakterk�dol�s haszn�lata a c�mke olvas�s�hoz"
 
 # bubble help
-#: src/prefs.c:914
+#: src/prefs.c:947
 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."
@@ -4085,55 +4182,55 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Feldolgoz�"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "C�mkemez�k kit�lt�se - Karakterkonverzi�"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 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:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Sz�k�z als�von�ss� alak�t�sa"
 
 # bubble help
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 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:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "�tnevez�s - Karakterkonverzi�"
 
 # bubble help
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 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:994
+#: src/prefs.c:1027
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Feldolgoz� - Karakterkonverzi�"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1001
+#: src/prefs.c:1034
 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:1005
+#: src/prefs.c:1038
 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,44 +4241,44 @@ msgstr ""
 "feldolgoz� 'Minden sz� els� bet�je legyen nagybet�' opci�ja be van kapcsolva."
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Feldolgoz�ablak"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Feldolgoz�ablak megnyit�sa ind�t�skor"
 
 # bubble help
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr "Feldolgoz�ablak megnyit�sa ind�t�skor"
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Feldolgoz�ablak mindig fel�l"
 
 # bubble help
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 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:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "Mez�k"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Mez�k fel�l�r�sa a c�mk�k feldolgoz�sakor"
 
 # bubble help
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4189,12 +4286,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:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "Ez a sz�veg az alap�rtelmezett 'megjegyz�s':"
 
 # bubble help
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4203,11 +4300,11 @@ msgstr ""
 "'megjegyz�s' mez� a megadott sz�veggel."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 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:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4218,44 +4315,44 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "CD adatb�zis"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 msgid "Server Settings for Automatic Search"
 msgstr "Szerver be�ll�t�sok az Automatikus keres�shez"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "N�v:"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "Port:"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "CGI el�r�si �t:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 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:1206
+#: src/prefs.c:1239
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "CD adatb�zis"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 #, fuzzy
 msgid "Path :"
 msgstr "CGI el�r�si �t:"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4264,56 +4361,56 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Proxy be�ll�t�s"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Proxy haszn�lata"
 
 # bubble help
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Proxy be�ll�t�sok aktiv�l�sa."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "G�pn�v:"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Proxy szerver neve."
 
 # bubble help
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Proxy szerver portja."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "Felhaszn�l� neve:"
 
 # bubble help
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "A felhaszn�l� neve a proxy szerveren."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "Felhaszn�l� jelszava:"
 
 # bubble help
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 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:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "S�v neve"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4321,7 +4418,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:1320
+#: src/prefs.c:1353
 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."
@@ -4330,7 +4427,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:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4341,71 +4438,75 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Meger�s�t�s"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Programb�l val� kil�p�s meger�s�t�se"
 
 # bubble help
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 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:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "C�mke �r�s�nak meger�s�t�se"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "F�jl �tnevez�s�nek meger�s�t�se"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "F�jl t�rl�s�nek meger�s�t�se"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "M3u listaf�jl �r�s�nak meger�s�t�se"
 
-#: src/prefs.c:1389
+#. 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:1422
 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:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "Ablak bez�r�sa ment�s n�lk�l"
 
 # bubble help
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 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:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(P�ld�ul : %.*d - f�jln�v.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "A v�ltoz�sok �letbe l�ptek"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "Be�ll�t�sok elmentve"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "A be�ll�t�sok nem v�ltoztak"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4416,11 +4517,11 @@ msgstr ""
 "'%s'\n"
 " (%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "Nem k�nyvt�r"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "A '%s' audio lej�tsz� nem tal�lhat�!"
@@ -4437,36 +4538,36 @@ msgstr "�tnevez�s"
 msgid "Process Fields"
 msgstr "Mez�feldolgoz�s"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "C�mke sikeresen feldolgozva..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "C�mke sikeresen feldolgozva...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, 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:660
+#: src/scan.c:663
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "A f�jl �tkonvert�l�sa nem lehets�ges %s ebben a rendszerben"
 
-#: src/scan.c:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "�j f�jln�v sikeresen feldolgozva..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "�j f�jln�v sikeresen feldolgozva...(%s)"
@@ -4474,42 +4575,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "C�mke �s f�jln�v feldolgoz�s"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Feldolgoz�: "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "Feldolgoz�t�pus v�laszt�sa"
 
 # bubble help
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Feldolgoz� ablak megnyit�sa / Kijel�lt f�jlok feldolgoz�sa"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Feldolgoz� be�ll�t�sai"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Maszkszerkeszt�t mutat/rejt"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Pusk�t mutat/rejt"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "Ablak bez�r�sa"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4517,16 +4618,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:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "El�n�zet"
 
 # bubble help
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr "Kit�lt�s a megadott maszkkal"
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4536,16 +4637,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:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "F�jl�tnevez�s el�n�zet..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Mez�k kijel�l�se:"
 
 # bubble help
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4553,193 +4654,193 @@ 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:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "F"
 
 # bubble help
-#: src/scan.c:2041
+#: src/scan.c:2152
 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:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
 # bubble help
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "M� c�me mez� feldolgoz�sa"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Ar"
 
 # bubble help
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "El�ad� mez� feldolgoz�sa"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
 # bubble help
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Album neve mez� feldolgoz�sa"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
 # bubble help
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "M�faj mez� feldolgoz�sa"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "Cm"
 
 # bubble help
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "Megjegyz�s mez� feldolgoz�sa"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "Cp"
 
 # bubble help
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Szerz� mez� feldolgoz�sa"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "O"
 
 # bubble help
-#: src/scan.c:2062
+#: src/scan.c:2173
 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:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Cr"
 
 # bubble help
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Kiad� mez� feldolgoz�sa"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
 # bubble help
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "URL mez� feldolgoz�sa"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "E"
 
 # bubble help
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "K�dol� mez� feldolgoz�sa"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Kijel�l�s megford�t�sa"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Kijel�l�s/Kijel�l�s megfordit�sa - mindenhol"
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Als�von�s �s '%20' sztring sz�k�zz� alak�t�sa"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Karaktercsere ezt:"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "ebbe: "
 
 # bubble help
-#: src/scan.c:2166
+#: src/scan.c:2281
 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:2169
+#: src/scan.c:2284
 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"
 
-# bubble help
-#: src/scan.c:2171
-msgid "Replace a character by an other one."
-msgstr "Karaktercsere"
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
 # bubble help
-#: src/scan.c:2203
+#: src/scan.c:2319
 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:2206
+#: src/scan.c:2322
 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:2209
+#: src/scan.c:2325
 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:2212
+#: src/scan.c:2328
 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"
 
-#: src/scan.c:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Sz�k�z besz�r�sa minden NAGYBET�S sz� el�"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 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:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4748,7 +4849,7 @@ msgstr ""
 "P�lda: 'Sz�veg a kijel�lt ablakban' --> 'Sz�vegakijel�ltablakban'"
 
 # bubble help
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4757,7 +4858,7 @@ msgstr ""
 "P�lda: 'Sz�vegAKijel�ltablakban' --> 'Sz�veg A Kijel�ltablakban'."
 
 # bubble help
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4769,186 +4870,186 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "Puska"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : el�ad�"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : megjegyz�s"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p : szerz�"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r : kiad�"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : CD lemez sz�ma"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : k�dol�"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : m�faj"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : mell�z�tt"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : s�vok sz�ma"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : Eredeti el�ad�"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : sorsz�m"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : c�m"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : �v"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Maszkszerkeszt�"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "�j maszk"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Maszk felfel� mozgat�sa"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Maszk lefel� mozgat�sa"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Maszk k�tszerez�se"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Alapmaszkok hozz�ad�sa"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "Maszk elt�vol�t�sa"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Maszkok ment�se"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "�j_maszk"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "M�sol�s: Nincs kijel�lt sor!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "Elt�vol�t�s: Nincs kijel�lt sor!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Felfel� mozgat�s: Nincs kijel�lt sor!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Lefel� mozgat�s: Nincs kijel�lt sor!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, fuzzy, 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:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, 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:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "Alap�rtelmezett be�ll�t�sok bet�lt�se..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "'%s' (%s)-t megnyit�sa sikertelen"
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, fuzzy, 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:1344
+#: src/setting.c:1358
 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:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "Alap�rtelmezett f�jl �tnevez� maszkok bet�lt�se..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Alap�rtelmezett k�nyvt�r �tnevez� maszkok bet�lt�se..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "HIBA: A Kezd� k�nyvt�r k�rnyezeti v�ltoz�ja nincs defini�lva!\n"
 "\n"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "HIBA: Nem lehet l�trehozni a '%s'(%s) k�nyvt�rat!"
@@ -5034,6 +5135,37 @@ msgstr "_Zene lej�tsz� futtat�sa"
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "A megadott el�r�si �t helytelen:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "kis �s NAGYBET�K megk�l�nb�ztet�se"
+
+# bubble help
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Karaktercsere"
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "F�jl tartalma bet�ltve:"
+
+#~ msgid "Files Name List :"
+#~ msgstr "F�jlok neveinek list�ja:"
+
+#, fuzzy
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(MP3 f�jl t�mogat�s nem el�rhet�)"
+
+#, fuzzy
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(MP3 f�jl t�mogat�s nem el�rhet�)"
+
 #, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "Hib�s ID3 c�mke verzi�"
diff --git a/po/it.gmo b/po/it.gmo
index 999f7c8..80e5bc8 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 912a4b9..ded8aa7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag-2.0.2it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2007-05-04 19:37+0200\n"
 "Last-Translator: Kostantino <ciclope10ATalice.it>\n"
 "Language-Team: italiano <it@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "First-Translator: Lorenzo Cappelletti <lorenzo.cappellettiATemail.it>\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
@@ -31,188 +31,230 @@ msgstr ""
 "semplice e stuzzicante interfaccia GTK+ rende più facile mettere le "
 "etichette in ambiente GNU/Linux."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(traduzione tedesca)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(traduzione russa)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(traduzione olandese)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(traduzione svedese)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(traduzione ungherese)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(traduzione italiana)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(traduzione giapponese)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(traduzione ucraina)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(traduzione ceca)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(traduzione spagnola)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(traduzione polacca)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(traduzione rumena)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(traduzione danese)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(traduzione greca)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(traduzione portoghese brasiliana)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(traduzione bulgara)"
 
-#: src/about.c:160
+#: src/about.c:171
 msgid "(Chinese translation)"
 msgstr "(traduzione cinese)"
 
-#: src/about.c:161
+#: src/about.c:172
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(traduzione greca)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(traduzione tedesca)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Commento"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "Informazioni..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "Informazioni"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compilato il: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(usando: GTK+ %d.%d.%d e id3lib %d.%d.%d)"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(il supporto per i file MP3 è stato disabilitato)"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "Autore: %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(il supporto per i file MP3 è stato disabilitato)"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "Posta elettronica: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Pagina web: "
 
-#: src/about.c:292
+#: src/about.c:328
+msgid "Description:"
+msgstr "Descrizione:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "(il supporto per i file MP3 è stato disabilitato)"
 
-#: src/about.c:296
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
 #, c-format
-msgid "(MP3 file support disabled)"
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
 msgstr "(il supporto per i file MP3 è stato disabilitato)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "Non c'è più memoria disponibile"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(il supporto per i file Ogg Vorbis è stato disabilitato)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(il supporto per i file MP3 è stato disabilitato)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(il supporto per i file FLAC è stato disabilitato)"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
 msgstr "(il supporto per i file MP4/AAC è stato disabilitato)"
 
-#: src/about.c:322
+#: src/about.c:460
 #, fuzzy
-msgid "(WavPack file support disabled)"
+msgid "WavPack file support"
 msgstr "(il supporto per i file MP3 è stato disabilitato)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "Autore: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "Posta elettronica: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Pagina web: "
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "Descrizione:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "Ringraziamenti"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "Traduzioni:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "Generale:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "Modifiche"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -545,7 +587,7 @@ msgstr "Rinomina cartella..."
 msgid "Reload Directory"
 msgstr "Ricarica cartella"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "Sfoglia cartella con..."
 
@@ -690,7 +732,7 @@ msgstr "È stato selezionato un nuovo percorso predefinito per i file"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Conferma..."
 
@@ -702,89 +744,68 @@ msgstr ""
 "Alcuni file sono stati modificati ma non salvati.\n"
 "Vuoi salvarli prima di cambiare cartella?"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"Il percorso indicato non è valido!\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "Errore..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 msgid "<All albums>"
 msgstr "<Tutti gli album>"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, 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:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "Artista"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# Album"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# File"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Vai alla cartella genitrice"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Immetti una cartella da sfogliare."
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Albero"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "Artista & Album"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "Rinomina la cartella"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Rinomina la cartella '%s' in: "
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "Usa maschera:"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 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:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -793,21 +814,31 @@ msgstr ""
 "nella Finestra Analizzatore) per rinominare la cartella dai campi "
 "dell'etichetta."
 
-#: src/browser.c:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "La Maschera Analizzatore non è valida"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "Anteprima di rinomina cartella..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Errore..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "Devi scrivere il nome di una cartella!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -836,7 +867,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -845,7 +876,7 @@ msgstr ""
 "Non posso rinominare nulla perché il nome della cartella esiste già!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -860,51 +891,51 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "Cartella rinominata"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Programma da eseguire:"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 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:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "Apri file con..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 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:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "Devi immettere il nome di un programma!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Non ho potuto trovare il programma '%s'!"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Non è possibile eseguire %s (errore %d)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "Non posso eseguire una nuova istanza di un altro processo!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Comando eseguito:  '%s %s'"
@@ -994,7 +1025,7 @@ msgstr "Cerca In:"
 msgid "All Fields"
 msgstr "Ogni Campo"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Altro"
 
@@ -1069,7 +1100,7 @@ msgstr "Categorie "
 msgid "Results :"
 msgstr "Risultati:"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "Cerca:"
 
@@ -1099,7 +1130,7 @@ msgstr "Deseleziona tutte le linee"
 msgid "Invert lines selection"
 msgstr "Inverti la selezione delle linee"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "Seleziona tutte le linee"
 
@@ -1124,15 +1155,15 @@ msgstr "Imposta A:"
 msgid "All"
 msgstr "Tutto"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "Nome File"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "Titolo"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "Anno"
 
@@ -1144,12 +1175,12 @@ msgstr "Traccia #"
 msgid "# Tracks"
 msgstr "# Tracce"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "Genere"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Esegui l'analisi corrente per ogni file"
 
@@ -1161,7 +1192,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1180,11 +1211,11 @@ msgstr ""
 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:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Pronto a cercare..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1192,76 +1223,76 @@ msgstr ""
 "Album: '%s', artista: '%s', lunghezza: '%s', anno: '%s', genere: '%s', ID: '%"
 "s'"
 
-#: src/cddb.c:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Inverti selezione"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Ordina per Numero Traccia"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Ordina per Nome Traccia"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Risolvo il nodo '%s'..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Non riesco a risolvere il nodo '%s' (%s)!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, 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:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Connessione al nodo '%s', porta '%d'..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Non riesco a connettermi al nodo '%s' (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Connesso al nodo '%s'"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Ricezione dati (%s)..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Si è verificato un errore leggendo la risposta cddb (%s)!"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Non riesco a creare il file '%s' (%s)"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Non posso aprire il file '%s' (%s)"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "Invio richiesta..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Non riesco ad inviare la richiesta (%s)!"
@@ -1270,62 +1301,62 @@ msgstr "Non riesco ad inviare la richiesta (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "Ricezione dati..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 msgid "The server returned a wrong answer!"
 msgstr "Il server ha fornito una risposta sbagliata!"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Il server ha fornito una risposta sbagliata! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 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:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Sono stati trovati %d album corrispondenti"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Sto ricevendo i dati della pagina %d..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Sto ricevendo i dati della pagina %d..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr "Altri risultati da caricare..."
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d file selezionati!"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 msgid "Local CD search..."
 msgstr "Ricerca CD locale..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
@@ -1334,27 +1365,27 @@ msgstr ""
 "Impostalo nella finestra delle preferenze."
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, 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:3231
+#: src/cddb.c:3268
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Sono stati trovati %d album corrispondenti per DiscID '%s'"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, 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:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "Sto caricando l'elenco delle tracce dell'album..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1367,7 +1398,7 @@ msgstr ""
 "\n"
 "Vuoi davvero continuare?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "Scrivi Etichette da CDDB..."
 
@@ -1646,11 +1677,11 @@ msgstr "Il collegamento del file è interrotto"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Livello ?"
 
@@ -1658,7 +1689,7 @@ msgstr "?, Livello ?"
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1666,17 +1697,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Freq:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Modalità:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1858,15 +1889,15 @@ msgid "Tag selected files with these pictures"
 msgstr "Etichetta i file selezionati con queste immagini"
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
-msgstr "Rimuovi le immagini selezionate o tutte le immagini."
-
-#: src/easytag.c:1051
 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:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "Rimuovi le immagini selezionate o tutte le immagini."
+
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "Salva le immagini selezionate sul disco rigido."
@@ -2242,7 +2273,7 @@ msgstr "Elimina File..."
 msgid "File '%s' deleted"
 msgstr "Il file '%s' è stato eliminato"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2254,111 +2285,111 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "Ricerca in corso..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "File: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, 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:3235
+#: src/easytag.c:3239
 #, 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:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u file"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 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:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "Non è stato trovato alcun file in questa cartella!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Ricerca..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "  INTERROMPI la ricerca...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "Seleziona una cartella da sfogliare!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "Etichetta i file selezionati con questo campo"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Converti '_' e '%20' in spazi"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "Converti ' ' in '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "Tutto maiuscolo"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "Tutto minuscolo"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "Prima lettera maiuscola"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "Prima lettera maiuscola per ogni parola"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "Rimuovi spazi"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Inserisci degli spazi prima delle lettere maiuscole"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 msgid "Remove duplicate spaces or underscores"
 msgstr "Rimuovi spazi o trattini duplicati"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: uscita anomala! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, c-format
-msgid "Received signal %s (%d)"
+msgid "Received signal %s (%d)\a"
 msgstr "Ricevuto segnale %s (%d) "
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2367,11 +2398,12 @@ 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@gmail.com"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Segnale sconosciuto"
 
-#: src/easytag.c:4466
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2384,8 +2416,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2405,11 +2436,11 @@ msgstr ""
 "path_to/files              Usa un percorso relativo.\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: uscita normale."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2417,7 +2448,7 @@ msgstr ""
 "Alcuni file sono stati modificati ma non salvati...\n"
 "Vuoi salvarli prima di uscire dal programma?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr "Vuoi veramente uscire dal programma?"
 
@@ -2514,7 +2545,7 @@ msgstr ""
 "nella codifica del sistema\n"
 "(Prova impostando la variabile d'ambiente G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "Traduzione del nome file"
 
@@ -2545,7 +2576,7 @@ msgstr "Canali:"
 #: src/flac_tag.c:140 src/flac_tag.c:741
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
-msgstr "Si è verificato un errore aprendo il file '%s' (%s)."
+msgstr "Si è verificato un errore aprendo il file '%s' (%s).\a"
 
 #: src/flac_tag.c:983 src/ogg_tag.c:752
 #, c-format
@@ -2693,122 +2724,122 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "File danneggiato..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr "Registro"
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " OK"
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " Sì "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " No "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " Applica "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " Salva "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " Annulla "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " Chiudi "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " Scrivi "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " Esegui "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr " Ricerca "
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr " Sfoglia... "
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "Seleziona cartella..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "Seleziona file..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "Warning..."
 msgstr "Attenzione..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr "Nessun riproduttore audio definito!"
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, 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:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "Genera una playlist"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "Nome della playlist M3U"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "Usa il nome di una cartella"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Modifica Maschere"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "Opzioni Playlist"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Includi solo i file selezionati"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2816,31 +2847,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:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "Usa un percorso completo per i file nella playlist"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 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:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "Crea la playlist nella cartella genitrice"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 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:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "Usa il separatore delle cartelle in stile DOS"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2848,23 +2879,23 @@ msgstr ""
 "Questa opzione sostituisce il separatore di cartelle UNIX  '/' con quello "
 "DOS '\\'."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "Contenuto Playlist"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "Scrivi solo la lista dei file"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "Scrivi le informazioni usando il nome del file"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Scrivi le informazioni usando:"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2873,12 +2904,12 @@ msgstr ""
 "Il file della playlist '%s' esiste già!\n"
 "Sovrascrivo?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "Scrivi Playlist..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2887,48 +2918,44 @@ msgstr ""
 "Non è possibile scrivere la playlist nel file '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "È stato scritto il file della playlist '%s'"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "Traccia"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Commento"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "Compositore"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "Artista Originale"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Diritti d'autore"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "URL"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "Codificato da"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "Cerca file"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2936,54 +2963,93 @@ msgstr ""
 "tutti i file."
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "In:"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "è l'Etichetta"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Maiuscolo e minuscolo"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Trovati: %d file"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "Carica i nomi dei file da un file di testo"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 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:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr "Carica "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "Caricato Contenuto File:"
+#: src/misc.c:2810
+#, 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:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "Inserisci uno spazio prima di una lettera maiuscola"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "Lista Nomi File:"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Elimina questa linea"
 
-#: src/misc.c:2828
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "Elimina tutte le linee vuote"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, 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:2870 src/misc.c:2964
+#, 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:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Ricarica"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Scrivi solo la lista dei file"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Seleziona tutte le linee"
+
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2992,21 +3058,23 @@ msgstr ""
 "attiva e dopo che i nomi dei file sono stati caricati (la finestra "
 "dell'analizzatore deve essere aperta)."
 
-#: src/misc.c:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "Inserisci una linea vuota"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "Elimina questa linea"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "Elimina tutte le linee vuote"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Sposta Su questa Maschera"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "Ricarica"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Sposta Giù questa Maschera"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3141,111 +3209,111 @@ msgstr ""
 msgid "Save file..."
 msgstr "Salva file..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "Immagine JPEG"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "Immagine PNG"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "Immagine sconosciuta"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "File icona PNG a 32x32 pixel"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "Altro file icona"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "Copertina (fronte)"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "Copertina (retro)"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "Pagina di volantino"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "Mezzo (cioè il lato dell'etichetta di un CD)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "Carica artista/carica esecutore/solista"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "Artista/esecutore"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "Conduttore"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "Gruppo/Orchestra"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "Lirico/scrittore testo"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "Località di registrazione"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "Durante la registrazione"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "Durante l'esecuzione"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "Cattura schermo film/video"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "Un pesce di colore intenso"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "Illustrazione"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "Logo gruppo/artista"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "Logo editore/studio"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "Tipo d'immagine sconosciuta"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "pixel"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "Tipo"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3253,11 +3321,11 @@ msgstr ""
 "Non posso mostrare l'immagine visto che non sono stati letti abbastanza dati "
 "per determinare come creare il buffer dell'immagine."
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "Sto caricando l'immagine..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3268,7 +3336,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "L'immagine non è stata caricata..."
 
@@ -3529,24 +3597,53 @@ msgstr ""
 "programma alcuni argomenti (ad esempio \"xmms -p\") prima di ottenere i "
 "file, come pure altri argomenti."
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Opzioni Etichetta"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "Centro della finestra principale"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr ""
+"Se questa opzione è attivata, la playlist sarà creata nella cartella "
+"genitrice."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "Impostazioni File"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "Opzioni File"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr ""
 "Sostituisci i caratteri illegali nel nome del file (per Windows e CD-ROM)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3559,53 +3656,53 @@ msgstr ""
 "Utile quando si rinomina file dall'etichetta usando l'analizzatore."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "Converti l'estensione del nome file in:"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "Minuscolo"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "Per esempio, l'estensione sarà convertita in '.mp3'"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "Maiuscolo"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "Per esempio, l'estensione sarà convertita in '.MP3'"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "Nessuna Modifica"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "L'estensione non sarà convertita"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "Mantieni la data di modifica del file"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
 "Mantieni la data di modifica (nelle proprietà file) quando salvi il file."
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3616,12 +3713,12 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr "Gruppo di caratteri per i nomi dei file"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
@@ -3629,11 +3726,11 @@ msgstr ""
 "Regole da applicare se alcuni caratteri non possono essere convertiti nella "
 "codifica di sistema quando venga scritto il nome del file:"
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "Prova un'altra codifica di caratteri"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
@@ -3644,12 +3741,12 @@ msgstr ""
 "ISO-8859-2 per 'ro'). Il sistema proverà la codifica ISO-8859-1 se ciò "
 "dovesse fallire."
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 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:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3658,7 +3755,7 @@ 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:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
@@ -3666,7 +3763,7 @@ msgstr ""
 "Forza l'uso della codifica di sistema e rifiuta silenziosamente alcuni "
 "caratteri"
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3677,20 +3774,20 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "Impostazioni Etichetta"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "Opzioni Etichetta"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "Completamento automatico della data se incompleta"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3700,11 +3797,11 @@ msgstr ""
 "della data (per esempio, se l'anno corrente è 2005: 5 => 2005, 4 => 2004, 6 "
 "=> 1996, 95 => 1995, etc.)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "Scrivi il campo della traccia con il seguente numero di cifre:"
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3715,11 +3812,11 @@ msgstr ""
 "con due cifre: '05', '09', '10',...). Altrimenti sarà mantenuto il valore "
 "'grezzo' della traccia."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "File Ogg Vorbis: scrivi il commento anche nel formato XMMS"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3733,7 +3830,7 @@ msgstr ""
 "selezionare questa opzione se non vuoi che altre applicazioni si lamentino "
 "per un campo sconosciuto! I commenti, però, non saranno mostrati in XMMS."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
@@ -3741,11 +3838,11 @@ msgstr ""
 "Focalizza il campo dell'etichetta quando scorri i file nella lista usando le "
 "scorciatoie PaginaSu/PaginaGiù."
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr "Focalizza sulle stesso campo dell'etichetta"
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr ""
 "Riporta l'attenzione al primo campo dell'etichetta (cioè il campo 'Titolo')"
@@ -3754,22 +3851,22 @@ msgstr ""
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "Impostazioni Etichetta ID3"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "Regole Etichetta ID3"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 #, fuzzy
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "Scrivi etichette ID3 nei file FLAC con l'etichetta FLAC"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3779,11 +3876,11 @@ msgstr ""
 "caso contrario le etichetta ID3 verranno tolte."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "Togli le etichette se tutti i campi sono vuoti"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3796,11 +3893,11 @@ msgstr ""
 "l'intera etichetta qualora questi sette campi risultino tutti vuoti."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Converti automaticamente le vecchie versioni delle etichette ID3v2"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3809,42 +3906,42 @@ msgstr ""
 "allaversione ID3v2.3, se questa opzione è attivata."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 #, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "Scrivi etichetta ID3v2"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Gruppo di caratteri per le etichette ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Scrivi etichetta ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "Scrivi etichetta ID3v2"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3854,12 +3951,12 @@ msgstr ""
 "MP3, se questa opzione è attivata. Sarà invece tolta in caso contrario."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 #, fuzzy
 msgid "Version:"
 msgstr "Descrizione:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3868,56 +3965,56 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Codificato da"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 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:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 #, fuzzy
 msgid "No"
 msgstr " No "
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "Etichetta ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "Scrivi etichetta ID3v1.x"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3925,22 +4022,22 @@ 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:846
+#: src/prefs.c:878
 #, 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:878
+#: src/prefs.c:910
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Gruppo di caratteri per le etichette ID3"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3971,32 +4068,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:914
+#: src/prefs.c:947
 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:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Analizzatore"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Analizzatore Riempi etichetta - Conversione Caratteri"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr ""
 "Converti il carattere trattino-basso '_' e la stringa '%20' nello spazio ' '"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Converti lo spazio ' ' nel trattino-basso '_'"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4005,11 +4102,11 @@ msgstr ""
 "dall'analizzatore per etichette, se questa opzione è attivata."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Analizzatore Rinomina File - Conversione Caratteri"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4018,18 +4115,18 @@ msgstr ""
 "dall'analizzatore per nomi di file, se questa opzione è attivata."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 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:1001
+#: src/prefs.c:1034
 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:1005
+#: src/prefs.c:1038
 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 "
@@ -4042,15 +4139,15 @@ msgstr ""
 "Voce'invece di 'Testo In Una Voce')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Finestra Analizzatore"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Apri la Finestra Analizzatore all'avvio"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4058,11 +4155,11 @@ msgstr ""
 "Attiva questa opzione per aprire automaticamente la finestra "
 "dell'analizzatore all'avvio di EasyTAG."
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Finestra dell'analizzatore sempre in primo piano"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4071,16 +4168,16 @@ msgstr ""
 "se questa opzione è attivata."
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "Campi"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Sovrascrivi i campi durante la scansione dell'etichetta"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4089,11 +4186,11 @@ msgstr ""
 "Verranno riempiti solo i campi vuoti se disattivata, se questa opzione è "
 "attivata."
 
-#: src/prefs.c:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "Imposta questo testo come commento predefinito:"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4102,12 +4199,12 @@ msgstr ""
 "commento quando usi l'analizzatore 'Riempi Etichetta'."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 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:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4118,42 +4215,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "Database CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 msgid "Server Settings for Automatic Search"
 msgstr "Impostazioni Server per Ricerca Automatica"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "Nome:"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "Porta:"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "Percorso CGI:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 msgid "Server Settings for Manual Search"
 msgstr "Impostazioni Server per Ricerca Manuale"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 msgid "Local CD Data Base"
 msgstr "Database Locale CD"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 msgid "Path :"
 msgstr "Percorso:"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4166,52 +4263,52 @@ msgstr ""
 "'soundtrack' e 'misc'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Impostazioni Proxy"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Utilizza un proxy"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Imposta come attive le impostazioni del server proxy."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "Nome Nodo:"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Nome del server proxy."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Porta del server proxy."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "Nome Utente:"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "Nome dell'utente per il server proxy."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "Password Ptente:"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 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:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "Elenco Nomi Traccia"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4219,7 +4316,7 @@ msgstr ""
 "Seleziona il file audio corrispondente (concordemente alla posizione o al "
 "DLM se attivato più sotto)"
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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."
@@ -4229,7 +4326,7 @@ msgstr ""
 "attivata."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4240,15 +4337,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Conferma"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Conferma l'uscita dal programma"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4256,53 +4353,57 @@ msgstr ""
 "Apre una finestra di dialogo per chiedere conferma prima di uscire dal "
 "programma, se questa opzione è attivata."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "Conferma la scrittura delle etichette"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "Conferma il cambio del nome dei file"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "Conferma l'eliminazione dei file"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "Conferma la scrittura della playlist"
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Applica le modifiche (senza salvare) e chiudi questa finestra"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "Chiudi questa finestra senza salvare"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 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:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Esempio: %.*d_-_Nome_traccia_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "Le modifiche sono state applicate"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "La configurazione è stata salvata"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "La configurazione è rimasta invariata"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4313,11 +4414,11 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "Non una cartella"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Il riproduttore audio '%s' non può essere trovato!"
@@ -4334,16 +4435,16 @@ msgstr "Rinomina File e Cartella"
 msgid "Process Fields"
 msgstr "Processa Campi"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "L'etichetta è stata analizzata con successo..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "L'etichetta è stata analizzata con successo... (%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4351,23 +4452,23 @@ msgstr ""
 "Analizzatore Etichetta: strano.... l'estensione '%s' non è stata trovata nel "
 "nome file '%s'!"
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, 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:660
+#: src/scan.c:663
 #, 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:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "Il nuovo nome del file è stato processato con successo..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Il nuovo nome del file è stato processato con successo... (%s)"
@@ -4375,41 +4476,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "Scansione Etichetta e Nome File"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Analizzatore: "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "Seleziona il tipo di analizzatore da usare"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Apri la finestra dell'analizzatore / Scansiona i file selezionati"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Opzioni Analizzatore"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Mostra/Nascondi Modificatore Maschere"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Mostra/Nascondi Legenda"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4419,15 +4520,15 @@ msgstr ""
 "etichette."
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "Anteprima riempimento etichette..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr "Anticipa la maschera con il percorso corrente"
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4440,15 +4541,15 @@ msgstr ""
 "carattere è /, altrimenti è relativo al vecchio percorso."
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "Anteprima rinomina file..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Seleziona i campi:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4457,126 +4558,126 @@ msgstr ""
 "Scegli quelli di tuo proprio interesse."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "Processa il campo nome"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "Processa il campo titolo"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "Processa il campo artista"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Processa il campo album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "Processa il campo genere"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "Processa il campo commento"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Processa il campo compositore"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 msgid "Process original artist field"
 msgstr "Processa il campo artista originale"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Processa il campo diritti d'autore"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "Processa il campo URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "Processa il campo nome del codificatore"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Inverti Selezione"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Seleziona/Deseleziona Tutto."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Converti '_' e '%20' in ' '"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Converti:"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "a:"
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4584,7 +4685,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:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4592,11 +4693,12 @@ msgstr ""
 "Il carattere spazio è sostituito con un trattino-basso. Esempio, prima: "
 "'Testo in una voce', dopo: 'Testo_in_una_voce'."
 
-#: src/scan.c:2171
-msgid "Replace a character by an other one."
-msgstr "Sostituisci un carattere con un altro."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4604,7 +4706,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:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4612,7 +4714,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:2209
+#: src/scan.c:2325
 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'."
@@ -4620,7 +4722,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:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4628,15 +4730,15 @@ 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:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Inserisci uno spazio prima di una lettera maiuscola"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "Rimuovi i duplicati di spazi ed i trattini-bassi"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4644,7 +4746,7 @@ msgstr ""
 "Rimuovi tutti gli spazi fra le parole. Esempio, prima: 'Testo In Una Voce', "
 "dopo:  'TestoInUnaVoce'."
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4652,7 +4754,7 @@ msgstr ""
 "Viene inserito uno spazio prima di ogni lettera maiuscola. Esempio, prima:  "
 "'TestoInUnaVoce', dopo:  'Testo In Una Voce'."
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4663,183 +4765,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artista"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : commento"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p : compositore"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r : diritti d'autore"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d: numero disco"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : codificato da"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genere"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorato"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : numero di tracce"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : artista originale"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : traccia"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : titolo"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : anno"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Modificatore Maschera"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "Crea Nuova Maschera"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Sposta Su questa Maschera"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Sposta Giù questa Maschera"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Duplica Maschera"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Aggiungi Maschere Predefinite"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "Rimuovi Maschera"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Salva Maschere"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "Nuova_maschera"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "Copia: nessuna riga selezionata!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "Rimuovi: nessuna riga selezionata!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Sposta su: nessuna riga selezionata!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Sposta giù: nessuna riga selezionata!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
-msgstr "ERRORE: non riesco a scrivere il file di configurazione %s (%s)"
+msgstr "ERRORE: non riesco a scrivere il file di configurazione %s (%s)\a"
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Non riesco ad aprire il file di configurazione '%s' (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "Carico la configurazione predefinita..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, 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:1264
+#: src/setting.c:1278
 #, 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)"
+msgstr "ERRORE: non riesco a scrivere la lista nel file %s (%s)\a"
 
 #. Fall back to defaults
-#: src/setting.c:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Carico le maschere preimpostate di 'Riempi Etichetta'..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "Carico le maschere preimpostate di 'Rinomina File'..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Carico le maschere preimpostate di 'Rinomina Cartella'..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ERRORE: la variabile d'ambiente HOME non è definita!"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ERRORE: non riesco a creare la cartella '%s' (%s)!"
@@ -4929,6 +5031,36 @@ msgstr "Riproduttore Audio: '%s'"
 msgid "EasyTAG settings dir: '%s'"
 msgstr "Cartella delle impostazioni EasyTAG: '%s'"
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Il percorso indicato non è valido!\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Maiuscolo e minuscolo"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Sostituisci un carattere con un altro."
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Caricato Contenuto File:"
+
+#~ msgid "Files Name List :"
+#~ msgstr "Lista Nomi File:"
+
+#, fuzzy
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(il supporto per i file MP3 è stato disabilitato)"
+
+#, fuzzy
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(il supporto per i file MP3 è stato disabilitato)"
+
 #, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "La versione dell'etichetta non è valida"
@@ -5066,8 +5198,8 @@ msgstr "Cartella delle impostazioni EasyTAG: '%s'"
 #~ "La traduzione del gruppo di caratteri da '%s'\n"
 #~ "a '%s' non è supportata!"
 
-#~ msgid "ERROR while opening file: '%s' (%s)"
-#~ msgstr "Si è verificato un errore aprendo il file '%s' (%s)"
+#~ msgid "ERROR while opening file: '%s' (%s)\a"
+#~ msgstr "Si è verificato un errore aprendo il file '%s' (%s)\a"
 
 #~ msgid "Load on startup the directory"
 #~ msgstr "Carica la cartella all'avvio"
diff --git a/po/ja.gmo b/po/ja.gmo
index b1b3270..20836e0 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index dcb29a4..100cf10 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag 1.99.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2007-01-08 14:44+0900\n"
 "Last-Translator: Takeshi AIHANA <takeshi.aihana@gmail.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
@@ -25,188 +25,230 @@ msgstr ""
 "クールな GTK+ インタフェースを採用しているので、GNU/Linux で簡単にタグの編集"
 "ができます。"
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(ドイツ語)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(ロシア語)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(オランダ語)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(スウェーデン語)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(ハンガリー語)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(イタリア語)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(日本語)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(ウクライナ語)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(チェコ語)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(スペイン語)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(ポーランド語)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(ルーマニア語)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(デンマーク語)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(ギリシア語)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(ブラジル・ポルトガル語)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(ブルガリア語)"
 
-#: src/about.c:160
+#: src/about.c:171
 msgid "(Chinese translation)"
 msgstr "(中国語)"
 
-#: src/about.c:161
+#: src/about.c:172
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(ギリシア語)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(ドイツ語)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "コメント"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "情報..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "情報"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(ビルドした日付: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(ビルド環境: GTK+ %d.%d.%d と id3lib %d.%d.%d)"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(MP3 ファイルはサポートしていません)"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "作者: %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(MP3 ファイルはサポートしていません)"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "E-メール: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "ウェブ・ページ: "
 
-#: src/about.c:292
+#: src/about.c:328
+msgid "Description:"
+msgstr "紹介:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "(MP3 ファイルはサポートしていません)"
 
-#: src/about.c:296
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
 #, c-format
-msgid "(MP3 file support disabled)"
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
 msgstr "(MP3 ファイルはサポートしていません)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "有効なメモリがありません"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(Ogg Vorbis ファイルはサポートしていません)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(MP3 ファイルはサポートしていません)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(FLAC ファイルはサポートしていません)"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
 msgstr "(MP4/AAC ファイルはサポートしていません)"
 
-#: src/about.c:322
+#: src/about.c:460
 #, fuzzy
-msgid "(WavPack file support disabled)"
+msgid "WavPack file support"
 msgstr "(MP3 ファイルはサポートしていません)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "作者: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-メール: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "ウェブ・ページ: "
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "紹介:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "貢献者"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "翻訳:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "全般:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "変更点"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -539,7 +581,7 @@ msgstr "フォルダ名の変更..."
 msgid "Reload Directory"
 msgstr "フォルダの再読み込み"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "他のプログラムで参照 ..."
 
@@ -684,7 +726,7 @@ msgstr "新しいデフォルトパスが指定されました"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "確認..."
 
@@ -696,86 +738,65 @@ msgstr ""
 "いくつかのファイルを変更しましたが、保存していません...\n"
 "フォルダを移動する前に保存しますか？"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"指定したパス名が正しくありません！:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "エラー..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 msgid "<All albums>"
 msgstr "<全てのアルバム>"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "エラー: %s の検索中に、ツリーのノード %s が見つかりませんでした。"
 
-#: src/browser.c:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "演奏者"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# アルバム"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# ファイル"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "アルバム名"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "上のフォルダへ移動します"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "参照するフォルダを入力して下さい。"
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "ツリー"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "演奏者 / アルバム"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "フォルダ名の変更"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "変更後のフォルダ '%s' の名前 : "
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "使用するマスク :"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 msgid "If activated, it will use masks to rename directory."
 msgstr "これを有効にすると、フォルダ名を変更する時のマスクとして使用します"
 
-#: src/browser.c:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -783,21 +804,31 @@ msgstr ""
 "タグフィールドからフォルダ名を変更するために使用するマスクのコード(凡例を参照"
 "のこと)を選択または入力して下さい"
 
-#: src/browser.c:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "スキャナマスクが正しくありません"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "フォルダ名変更のプレビュー..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "エラー..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "フォルダ名を入力して下さい！"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -826,7 +857,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -835,7 +866,7 @@ msgstr ""
 "このフォルダ名が既に存在しているので、名前を変更できません！\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -850,49 +881,49 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "フォルダ名を変更しました"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "実行するプログラム :"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "実行するプログラム名を入力して下さい。引数は現在のフォルダ名になります。"
 
-#: src/browser.c:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "他のプログラムで開く..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "実行するプログラム名を入力して下さい。引数は現在のファイル名になります。"
 
-#: src/browser.c:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "プログラム名を入力して下さい！"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "プログラム '%s' が見つかりません！"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "%sを実行できません！ (エラー %d)\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "子プロセスを作成すできません！\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "コマンドと引数 : '%s %s'"
@@ -980,7 +1011,7 @@ msgstr "検索対象 :"
 msgid "All Fields"
 msgstr "全てのフィールド"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "その他"
 
@@ -1055,7 +1086,7 @@ msgstr " カテゴリ "
 msgid "Results :"
 msgstr "結果 :"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "検索 :"
 
@@ -1084,7 +1115,7 @@ msgstr "全ての行を未選択にする"
 msgid "Invert lines selection"
 msgstr "選択した行を未選択に反転します"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "全ての行を選択します"
 
@@ -1109,15 +1140,15 @@ msgstr "セット先 :"
 msgid "All"
 msgstr "全て"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "ファイル名"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "タイトル"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "制作年"
 
@@ -1129,12 +1160,12 @@ msgstr "トラック #"
 msgid "# Tracks"
 msgstr "# トラック"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "ジャンル"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "各ファイルに現在のスキャナを実行する"
 
@@ -1146,7 +1177,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1163,11 +1194,11 @@ msgstr ""
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "指定した行または (もし行が指定されなければ) 全ての行を読み込みます"
 
-#: src/cddb.c:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "検索の準備完了..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1175,76 +1206,76 @@ msgstr ""
 "アルバム: '%s', 演奏者: '%s', 時間: '%s', 制作年: '%s', ジャンル: '%s', ID: "
 "'%s'"
 
-#: src/cddb.c:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "選択範囲を反転する"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "トラック番号で並び替え"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "トラック名で並べ替え"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "ホスト '%s' の検索中 ..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "ホスト '%s' (%s) の名前解決ができません！"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "新しいソケット (%s) を生成できません！"
 
 #. Open connection to the server
-#: src/cddb.c:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "ホスト '%s' (ポート '%d') に接続中 ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "ホスト '%s' (%s) に接続できません！"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "ホスト '%s' に接続しました"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "データ (%s) の受信中 ..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "cddb からの応答 (%s) の読み込み中にエラー！"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "ファイル '%s' (%s) を生成できません"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "ファイル '%s' (%s) が開けません"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "リクエストの送信中 ..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "リクエスト (%s) を送信できません！"
@@ -1253,90 +1284,90 @@ msgstr "リクエスト (%s) を送信できません！"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "データの受信中 ..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 msgid "The server returned a wrong answer!"
 msgstr "サーバがおかしなデータを返してきました！"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "サーバがおかしなデータを返してきました！ (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr "すみません、現在ウエブ検索はダウンしています！"
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "一致するアルバムが %d 個見つかりました"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "%d ページのデータの受信中..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "%d ページのデータの受信中..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr "さらに読み込んだ結果..."
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d 個のファイルを選択しました"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 #, fuzzy
 msgid "Local CD search..."
 msgstr "検索の準備完了..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "リクエストの要求中 (CddbId: %s, トラック番号: %d, サイズ: %d) ..."
 
-#: src/cddb.c:3231
+#: src/cddb.c:3268
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "一致するアルバムが %d 個見つかりました"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "ファイル '%s' (%s) が開けません"
 
 #. Load the track list of the album
-#: src/cddb.c:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "アルバムのトラック一覧の読み込み中 ..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1349,7 +1380,7 @@ msgstr ""
 "\n"
 "続行してもよろしいですか？"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "CDDB からタグの書き込み中..."
 
@@ -1625,11 +1656,11 @@ msgstr "ファイルのリンクがありません"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, レイヤー ?"
 
@@ -1637,7 +1668,7 @@ msgstr "?, レイヤー ?"
 msgid "Bitrate:"
 msgstr "ビットレート:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? KB/秒"
 
@@ -1645,17 +1676,17 @@ msgstr "? KB/秒"
 msgid "Freq:"
 msgstr "周波数:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "モード:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1838,13 +1869,13 @@ msgid "Tag selected files with these pictures"
 msgstr "これらの画像を選択したファイルにタグ付けします"
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
-msgstr "選択した画像または全ての画像を削除します"
-
-#: src/easytag.c:1051
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "画像をタグに追加します (ドラッグ＆ドロップも可能)"
 
+#: src/easytag.c:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "選択した画像または全ての画像を削除します"
+
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "選択した画像を保存します"
@@ -2216,7 +2247,7 @@ msgstr "ファイルの削除..."
 msgid "File '%s' deleted"
 msgstr "ファイル '%s' が削除されました"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2228,109 +2259,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "検索中..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "ファイル: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "このフォルダ配下に %d 個のファイルが見つかりました"
 
-#: src/easytag.c:3235
+#: src/easytag.c:3239
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "このフォルダの中に %d 個のファイルが見つかりました"
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u 個のファイル"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr "このフォルダ配下にはファイルがありませんでした！"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "このフォルダの中にはファイルがありませんでした！"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "検索中..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "  検索の停止...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "参照するフォルダを選択して下さい！"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "選択したファイルにこのフィールドをタグ付けします"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "'_' と '%20' をスペースに変換する"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "' ' を '_' に変換する"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "全て大文字にする"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "全て小文字にする"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "最初の文字だけ大文字にする"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "単語の最初の文字だけ大文字にする"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "スペースを削除する"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "大文字の前にスペースを挿入する"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 msgid "Remove duplicate spaces or underscores"
 msgstr "重複したスペースまたはアンダースコアを削除する"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: 異常終了しました！ (PID: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, fuzzy, c-format
-msgid "Received signal %s (%d)"
-msgstr "シグナル %s (%d) を受け取りました\n"
+msgid "Received signal %s (%d)\a"
+msgstr "シグナル %s (%d) を受け取りました\a\n"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2340,11 +2371,12 @@ msgstr ""
 "(`gdb easytag core` して 'bt' と 'l' コマンドの結果) を easytag@gmail.com ま"
 "でメールして下さい。"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "不明なシグナル"
 
-#: src/easytag.c:4466
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2357,8 +2389,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2378,11 +2409,11 @@ msgstr ""
 "path_to/files     現在のフォルダからファイルを読み込む\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: 正常に終了しました。"
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2390,7 +2421,7 @@ msgstr ""
 "いくつかのファイルを変更しましたが、保存していません...\n"
 "プログラムを終了する前に保存しますか？"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr " 本当にプログラムを終了しますか？"
 
@@ -2488,7 +2519,7 @@ msgstr ""
 "変換できませんでした : '%s'\n"
 "(環境変数 G_FILENAME_ENCODING を設定してみて下さい)"
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "ファイル名の翻訳"
 
@@ -2521,7 +2552,7 @@ msgstr "チャンネル数:"
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "ファイルのオープン中にエラー: '%s' (%s)\n"
-""
+"\a"
 
 #: src/flac_tag.c:983 src/ogg_tag.c:752
 #, c-format
@@ -2661,123 +2692,123 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "壊れたファイル..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " 確認 "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " はい "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " いいえ "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " 適用 "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " 保存 "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " キャンセル "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " 閉じる "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " 書き込み "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " 実行 "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr "検索"
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr " 参照... "
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "フォルダの選択..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "ファイルの選択..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 #, fuzzy
 msgid "Warning..."
 msgstr "検索中..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "'%s' (%s) を実行できません！\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "演奏一覧の生成"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "M3U 演奏一覧の名前"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "フォルダ名を使用する"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "マスクの編集"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "演奏一覧のオプション"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "指定したファイルのみ含める"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2785,29 +2816,29 @@ msgstr ""
 "これを有効にすると、選択したファイルのみ演奏一覧へ書き込まれます (無効にする"
 "と、全てのファイルが書き込まれます)"
 
-#: src/misc.c:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "演奏一覧の中でファイルのフルパス名を使用する"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 msgid "Use relative path for files in playlist"
 msgstr "演奏一覧の中でファイルに関連するパス名を使用する"
 
 #. Create playlist in parent directory
-#: src/misc.c:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "演奏一覧を親フォルダに生成する"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "これを有効にすると、演奏一覧を親フォルダに生成します"
 
 #. DOS Separator
-#: src/misc.c:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "DOS フォルダの区切りを使用する"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2815,23 +2846,23 @@ msgstr ""
 "これは UNIX フォルダの区切り '/' を DOS の区切り '\\' へ置き換えるオプション"
 "です"
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "演奏一覧の内容"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "演奏一覧ファイルの保存のみ"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "ファイル名で使用する情報の保存のみ"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "書き込む情報 :"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2840,12 +2871,12 @@ msgstr ""
 "演奏一覧ファイル '%s' は既に存在します！\n"
 "上書きしますか？"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "演奏一覧の書き込み中..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2854,48 +2885,44 @@ msgstr ""
 "演奏一覧ファイル '%s' を書き込めません！\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "演奏一覧ファイル '%s' が書き込まれました"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "トラック"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "コメント"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "コンポーザ"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "演奏者:"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "ライセンス"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "URL"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "エンコーダ"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "ファイルの検索"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2903,74 +2930,115 @@ msgstr ""
 "示します)"
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "対象 :"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "タグ"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "大小文字を無視する"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "一致するファイル: %d 個"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "TEXT ファイルからファイル名を読み込む"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 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:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " 読み込む "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "読み込んだファイルの内容 :"
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "ファイル名の変更を確認する"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "ファイル名の一覧 :"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "大文字の前にスペースを挿入する"
 
-#: src/misc.c:2828
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "この行を削除する"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "空行を全て削除する"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "指定したファイルのみ含める"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "指定したファイルのみ含める"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "再読込"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "演奏一覧ファイルの保存のみ"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "全ての行を選択します"
+
+#: src/misc.c:3016
 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:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "空行を挿入する"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "この行を削除する"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "空行を全て削除する"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "このマスクを上に移動します"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "再読込"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "このマスクを下に移動します"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3105,111 +3173,111 @@ msgstr ""
 msgid "Save file..."
 msgstr "ファイルの保存..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "JPEG 画像"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "PNG 画像"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "不明"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "PNG 形式のアイコン"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "別の種類のアイコン"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "ジャケット (表)"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "ジャケット (裏)"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "チラシ"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "メディア (例: CDのラベル)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "メインの演奏者/出演者/ソロ"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "演奏者/出演者"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "指揮者"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "バンド/オーケストラ"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "作詞"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "録音場所"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "録音時間"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "演奏時間"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "映画/ビデオのキャプチャ"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "A bright coloured fish"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "イラスト"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "バンド/演奏者のロゴ"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "販売元/スタジオのロゴ"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "不明"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "ピクセル"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "種類"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "説明"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3217,11 +3285,11 @@ msgstr ""
 "画像用のバッファを生成するために必要なデータを読み込むことができなかったた"
 "め、画像を表示できません。"
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "画像ファイルの読み込み中..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3232,7 +3300,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "画像ファイルを読み込んでいません..."
 
@@ -3485,23 +3553,50 @@ msgstr ""
 "p` のように)、演奏一覧のファイル名を指定する引数をプログラムに引き渡すことが"
 "可能です"
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "タグのオプション"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "メイン・ウィンドウの中央"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr "これを有効にすると、演奏一覧を親フォルダに生成します"
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "ファイルの設定"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "ファイルのオプション"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr "ファイル名にある不正な文字を置き換える (Windows と CD-ROM 向け)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3514,52 +3609,52 @@ msgstr ""
 "を変更する時に便利です)"
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "変換後の拡張子 :"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "小文字"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "たとえば、変換後の拡張子は '.mp3' になります"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "大文字"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "たとえば、変換後の拡張子は '.MP3' になります"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "変更しない"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "拡張子は変更しません"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "ファイルの変更日時を保存する"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr "ファイルを保存する時にプロパティの中にある変更日時を保存します"
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3570,12 +3665,12 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr "ファイル名に使用するエンコーディング"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
@@ -3583,11 +3678,11 @@ msgstr ""
 "ファイル名を書き込む時にシステムのエンコーディングに変換できない文字がある場"
 "合に適用するルールです"
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "別のエンコーディングを試す"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
@@ -3597,12 +3692,12 @@ msgstr ""
 "(例: 'fr' ならば ISO-8859-1、'ru' ならば KOI8-R、'ro' ならば ISO-8859-2)、失"
 "敗した場合は ISO-8859-1 への変換を試みます"
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "システムのエンコーディングに強制的に変換して音訳してみる"
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3611,13 +3706,13 @@ msgstr ""
 "このオプションを指定すると、文字が対象となる文字セットで表現できない時は、そ"
 "の文字に似た一個以上の文字に近似します"
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr "システムのエンコーディングに強制的に変換して変換できない文字は無視する"
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3628,20 +3723,20 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "タグの設定"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "タグのオプション"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "日付を自動的に補完する"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3650,11 +3745,11 @@ msgstr ""
 "入力した日付の最後が数字の場合、年を自動的に補完してみます (例: 現在の年が "
 "2005 年の場合、5 => 2005、4 => 2004、6 => 1996、95 => 1995)"
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "トラック番号に書き込む二桁の数値:"
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3664,11 +3759,11 @@ msgstr ""
 "数値で指定: '05'、'09'、'10'...) が付与されます (それ以外は実際のトラック・"
 "フィールドのままにします)"
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Ogg Vorbis ファイル : コメントを XMMS 形式で書き込む"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3682,17 +3777,17 @@ msgstr ""
 "リで不明なフィールドについて文句をいわれたくない場合は、このオプションを無効"
 "にして下さい。そのかわり XMMS でコメントを表示できません。"
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr "一覧でスクロールした時にフォーカスを与えるタグフィールド:"
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr "同じタグフィールドにフォーカスを当てたままにする"
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr "先頭のタグフィールド (タイトル) にフォーカスを戻す"
 
@@ -3700,22 +3795,22 @@ msgstr "先頭のタグフィールド (タイトル) にフォーカスを戻�
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "ID3 タグの設定"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "ID3 タグ付けのルール"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 #, fuzzy
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "FLAC ファイルの ID3 タグを FLAC タグで書き込む"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3724,11 +3819,11 @@ msgstr ""
 "します)"
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "タグの全てのフィールドが空白の場合は削除する"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3741,11 +3836,11 @@ msgstr ""
 "なります"
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "古いバージョン ID3v2 タグを自動的に変換する"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3754,42 +3849,42 @@ msgstr ""
 "ID3v2.2 に更新します"
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 #, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "ID3 Ver2 でタグを書き込む"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "ID3 タグの文字セット"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "ID3 Ver2 でタグを書き込む"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "ID3 Ver2 でタグを書き込む"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3799,12 +3894,12 @@ msgstr ""
 "れ以外は削除します)"
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 #, fuzzy
 msgid "Version:"
 msgstr "紹介:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3813,56 +3908,56 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "エンコーダ"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 msgid "Character set used to write the tag data in the file."
 msgstr "ファイルのタグ情報を書き込む際に使用する文字セットです"
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 #, fuzzy
 msgid "No"
 msgstr " いいえ "
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ID3 タグ"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "ID3 Ver1.x でタグを書き込む"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3870,22 +3965,22 @@ msgstr ""
 "これを有効にすると、MP3 ファイルの最後に ID3 Ver1 タグが追加/更新されます (そ"
 "れ以外は削除します)"
 
-#: src/prefs.c:846
+#: src/prefs.c:878
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "ファイルのタグ情報を書き込む際に使用する文字セットです"
 
 #. Character Set for reading tag
-#: src/prefs.c:878
+#: src/prefs.c:910
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "ID3 タグの文字セット"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3914,31 +4009,31 @@ msgstr ""
 "込まれたタグを読み込むために 'Windows-1251' を選択して下さい (Unix の場合は "
 "'KOI8-R')"
 
-#: src/prefs.c:914
+#: src/prefs.c:947
 msgid "Character set used to read tag data in the file."
 msgstr "ファイルのタグ情報を読み込む際に使用する文字セットです"
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "スキャナ"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "タグ付与スキャナ - 文字セットの変換"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "アンダースコア '_' と文字列 '%20' をスペース ' ' に変換する"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "スペース ' ' をアンダースコア '_' に変換する"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -3946,11 +4041,11 @@ msgstr ""
 "これを有効にすると、タグのスキャナでマスクを適用した際にこの変換を使用します"
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "ファイル名変更のスキャナ - 文字セットの変換"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -3959,17 +4054,17 @@ msgstr ""
 "します"
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "PFS - 文字セットの変換"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1001
+#: src/prefs.c:1034
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "前置詞や箇条書きの場合は先頭にある文字を大文字にしない"
 
-#: src/prefs.c:1005
+#: src/prefs.c:1038
 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 "
@@ -3981,15 +4076,15 @@ msgstr ""
 "Entry' ではなく 'Text in an Entry')"
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "スキャナ・ウィンドウ"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "起動時にスキャナ・ウィンドウを開く"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -3997,11 +4092,11 @@ msgstr ""
 "これを有効にすると、EasyTAG が起動されたら自動的にスキャナ・ウィンドウが開き"
 "ます"
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "スキャナ・ウィンドウを常に上に配置する"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4010,16 +4105,16 @@ msgstr ""
 "れます"
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "フィールド"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "タグのスキャン時にフィールドを上書きする"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4027,11 +4122,11 @@ msgstr ""
 "これを有効にすると、スキャナはフィールドの中のテキストを新しいテキストに置き"
 "換えます (無効にすると、空のフィールドのみ埋められます)"
 
-#: src/prefs.c:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "このテキストをデフォルトのコメントにする :"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4040,12 +4135,12 @@ msgstr ""
 "合にこのオプションを有効にして下さい"
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "デフォルトのコメントに CRC32 を使用します (ID3 タグが付いたファイルのみ)"
 
-#: src/prefs.c:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4056,44 +4151,44 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "CD データベース"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 msgid "Server Settings for Automatic Search"
 msgstr "自動検索のサーバ側の設定"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "名前 :"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "ポート番号 :"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "CGI パス名 :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 msgid "Server Settings for Manual Search"
 msgstr "手動検索のサーバ側の設定"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "CD データベース"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 #, fuzzy
 msgid "Path :"
 msgstr "CGI パス名 :"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4102,58 +4197,58 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "プロキシの設定"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "プロキシを使う"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "利用するプロキシ・サーバを入力して下さい"
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "ホスト名 :"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "プロキシ・サーバの名前"
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "プロキシ・サーバのポート番号"
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "ユーザ名 :"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "プロキシ・サーバに対するユーザ名です"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "ユーザ・パスワード :"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr "プロキシ・サーバに対するユーザのパスワードです"
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "トラック名の一覧"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr "関連する楽曲ファイルを選択する (位置または DLM に相当するもの)"
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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."
@@ -4162,7 +4257,7 @@ msgstr ""
 "ファイルも自動的に選択します"
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4171,67 +4266,71 @@ msgstr "楽曲ファイルの名前に一致するタイトルに DLM を適用�
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "確認メッセージ"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "プログラムの終了を確認する"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr "これを有効にすると、プログラム終了時に確認ダイアログが表示されます"
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "タグの書き込みを確認する"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "ファイル名の変更を確認する"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "ファイルの削除を確認する"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "演奏一覧の書き込みを確認する"
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr "設定を適用して(保存はしません)、このダイアログを閉じます"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "設定を保存せずに、このダイアログを閉じます"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 msgid "Save changes and close this window"
 msgstr "設定を保存して、このダイアログを閉じます"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(例 : %.*d_-_Track_name_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "設定が適用されました"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "設定が保存されました"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "設定が変更されませんでした"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4242,11 +4341,11 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "フォルダではありません"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "オーディオ・プレイヤー '%s' が見つかりません！"
@@ -4263,36 +4362,36 @@ msgstr "ファイル名とフォルダ名の変更"
 msgid "Process Fields"
 msgstr "フィールドを編集する"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "タグのスキャンが完了しました..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "タグのスキャンが完了しました...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "スキャンエラー: セパレータ '%s' ('%s' の中にある) が見つかりません"
 
-#: src/scan.c:660
+#: src/scan.c:663
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "ファイル '%s' をシステムのエンコーディングに変換できませんでした"
 
-#: src/scan.c:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "新しいファイル名のスキャンが完了しました..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "新しいファイル名のスキャンが完了しました...(%s)"
@@ -4300,41 +4399,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "タグとファイル名のスキャン"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "スキャナ :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "使用するスキャナのタイプを選択して下さい"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "スキャナ・ウィンドを開くか、指定したファイルをスキャンします"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "スキャナに関連するオプションです"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "マスクエディタの表示を ON/OFF します"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "凡例の表示を ON/OFF します"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "このウィンドウを閉じます"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4343,15 +4442,15 @@ msgstr ""
 "選択または入力して下さい (タグフィールドを埋めるときに使用します)"
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "タグの埋め込みのプレビュー..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr "このパスをマスクする接頭子"
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4364,15 +4463,15 @@ msgstr ""
 "て扱い、それ以外は相対パスとして扱います"
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "ファイル名変更のプレビュー..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "フィールドの選択:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4381,126 +4480,126 @@ msgstr ""
 "下さい。"
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "プロセスファイル名・フィールド"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "プロセスタイトル・フィールド"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "プロセスファイル・演奏者フィールド"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "プロセスアルバム・フィールド"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "プロセス・ジャンル・フィールド"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "プロセスコメント・フィールド"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "プロセス・コンポーザ・フィールド"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 msgid "Process original artist field"
 msgstr "プロセス・オリジナルの演奏者フィールド"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "プロセス・ライセンス・フィールド"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "プロセス URL フィールド"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "プロセス・エンコーディング・フィールド"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "選択範囲の反転"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "全て選択/選択解除"
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "'_' と '%20' を ' ' に変換する"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "変換 :"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "→"
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4508,7 +4607,7 @@ msgstr ""
 "アンダースコアまたは文字列 %20 を一つのスペースに置き換えます (例: 変換前"
 "='Text%20In%20An_Entry' 変換後='Text In An Entry')"
 
-#: src/scan.c:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4516,11 +4615,12 @@ msgstr ""
 "スペースを一つのアンダースコアに置き換えます (例: 変換前='Text In An Entry' "
 "変換後='Text_In_An_Entry')"
 
-#: src/scan.c:2171
-msgid "Replace a character by an other one."
-msgstr "別の文字で置き換えます"
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4528,7 +4628,7 @@ msgstr ""
 "全てのフィールドの全ての文字を大文字に変換します (例: 変換前='Text IN AN "
 "entry' 変換後='TEXT IN AN ENTRY')"
 
-#: src/scan.c:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4536,7 +4636,7 @@ msgstr ""
 "全てのフィールドの全ての文字を小文字に変換します (例: 変換前='TEXT IN an "
 "entry' 変換後='text in an entry')"
 
-#: src/scan.c:2209
+#: src/scan.c:2325
 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'."
@@ -4544,7 +4644,7 @@ msgstr ""
 "全てのフィールドの最初の文字を大文字に、その他の文字を小文字置き換えます "
 "(例: 変換前='text IN An ENTRY' 変換後='Text in an entry')"
 
-#: src/scan.c:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4552,15 +4652,15 @@ msgstr ""
 "全てのフィールドの各単語の最初の文字を大文字に、その他の文字を小文字に置き換"
 "えます (例: 変換前='Text in an ENTRY' 変換後='Text In An Entry')"
 
-#: src/scan.c:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "大文字の前にスペースを挿入する"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "重複するスペースまたはアンダースコアを削除する"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4568,7 +4668,7 @@ msgstr ""
 "単語間にあるスペースを全て削除します (例: 変換前='Text In An Entry' 変換後"
 "='TextInAnEntry')"
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4576,7 +4676,7 @@ msgstr ""
 "各大文字の前にスペースを挿入します (例: 変換前='TextInAnEntry' 変換後='Text "
 "In An Entry')"
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4587,190 +4687,190 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "凡例"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : 演奏者"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : アルバム"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : コメント"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p : コンポーザ"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r : ライセンス"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : ディスクの番号"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : エンコーディング"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : ジャンル"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : 無視"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : トラック番号"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : 演奏者"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : トラック"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : タイトル"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : 制作年"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "マスク・エディタ"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "新しいマスクを作成します"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "このマスクを上に移動します"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "このマスクを下に移動します"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "マスクの複製を作成します"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "デフォルト・マスクを追加します"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "マスクを削除します"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "マスクを保存します"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "新しいマスク"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "複製: マスクが選択されていません！"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "削除: マスクが選択されていません！"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "上に移動: マスクが選択されていません！"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "下に移動: マスクが選択されていません！"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 "ERROR: 設定ファイルを保存できません: %s (%s)\n"
-""
+"\a"
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "設定ファイル '%s' を開けません (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "デフォルトの設定をロード中..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "ファイル '%s' (%s) を生成または開けません"
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
 "ERROR: 一覧をファイルに書き込めません: %s (%s)\n"
-""
+"\a"
 
 #. Fall back to defaults
-#: src/setting.c:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "デフォルトの 'タグを埋める' マスクをロード中..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "デフォルトの 'ファイル名変更' マスクをロード中..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "デフォルトの 'フォルダ名変更' マスクをロード中..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "エラー: 環境変数 $HOME が定義されていません！\n"
 "\n"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "エラー: フォルダ '%s' を生成できません！ (%s)"
@@ -4856,6 +4956,36 @@ msgstr "オーディオ・プレイヤーの起動"
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "指定したパス名が正しくありません！:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "大小文字を無視する"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "別の文字で置き換えます"
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "読み込んだファイルの内容 :"
+
+#~ msgid "Files Name List :"
+#~ msgstr "ファイル名の一覧 :"
+
+#, fuzzy
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(MP3 ファイルはサポートしていません)"
+
+#, fuzzy
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(MP3 ファイルはサポートしていません)"
+
 #, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "タグのバージョンが正しくありません"
@@ -4984,10 +5114,10 @@ msgstr ""
 #~ "文字コード変換はサポートしていません！"
 
 #, fuzzy
-#~ msgid "ERROR while opening file: '%s' (%s)"
+#~ msgid "ERROR while opening file: '%s' (%s)\a"
 #~ msgstr ""
 #~ "ファイルのオープン中にエラー: '%s' (%s)\n"
-#~ ""
+#~ "\a"
 
 #~ msgid "Load on startup the directory"
 #~ msgstr "起動時にフォルダを読み込む"
diff --git a/po/nl.gmo b/po/nl.gmo
index 05d14d1..e587055 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 5dd513d..f1597b6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 1.99.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2004-11-21 19:20+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: src/about.c:122
+#: src/about.c:134
 #, fuzzy
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
@@ -29,193 +29,234 @@ msgstr ""
 "FLAC-, Ogg Vorbis, MusePack en Monkeys Audio-bestanden. De handige GTK+-"
 "interface maakt het taggen erg eenvoudig."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(Duitse vertaling)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(Russische vertaling)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(Nederlandse vertaling)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(Zweedse vertaling)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(Hongaarse vertaling)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(Italiaanse vertaling)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(Japanse vertaling)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(Oekraïnse vertaling)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(Tsjechische vertaling)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(Spaanse vertaling)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(Poolse vertaling)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(Roemeense vertaling)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(Deense vertaling)"
 
-#: src/about.c:157
+#: src/about.c:168
 #, fuzzy
 msgid "(Greek translation)"
 msgstr "(Duitse vertaling)"
 
-#: src/about.c:158
+#: src/about.c:169
 #, fuzzy
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Japanse vertaling)"
 
-#: src/about.c:159
+#: src/about.c:170
 #, fuzzy
 msgid "(Bulgarian translation)"
 msgstr "(Hongaarse vertaling)"
 
-#: src/about.c:160
+#: src/about.c:171
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(Japanse vertaling)"
 
-#: src/about.c:161
+#: src/about.c:172
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(Duitse vertaling)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(Duitse vertaling)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Commentaar"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "Info..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "Info"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(gecompileerd: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(gebruikt: GTK+ %d.%d.%d en id3lib %d.%d.%d)"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "Auteur: %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "E-mail: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Homepage: "
 
-#: src/about.c:292
+#: src/about.c:328
+msgid "Description:"
+msgstr "Beschrijving:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:296
-#, fuzzy, c-format
-msgid "(MP3 file support disabled)"
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
+#, c-format
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "(Niet beschikbaar)"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(Ondersteuning voor Ogg Vorbis-bestanden uitgeschakeld)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:317
+#: src/about.c:450
 #, fuzzy
-msgid "(MP4/AAC file support disabled)"
+msgid "MP4/AAC file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:322
+#: src/about.c:460
 #, fuzzy
-msgid "(WavPack file support disabled)"
+msgid "WavPack file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "Auteur: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-mail: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Homepage: "
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "Beschrijving:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "Met dank aan"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "Vertalingen:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "Algemeen:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "Wijzigingen"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -223,7 +264,7 @@ msgstr "Kan bestand '%s' (%s) niet openen"
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr ""
 "FOUT tijdens het openen van bestand: '%s' (%s).\n"
-""
+"\a"
 
 #.
 #. * Main Menu Actions
@@ -552,7 +593,7 @@ msgstr "Map hernoemen..."
 msgid "Reload Directory"
 msgstr "Map herladen"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "Bladeren door map met ..."
 
@@ -702,7 +743,7 @@ msgstr "Nieuwe standaardmap voor bestanden geselecteerd"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Bevestigen..."
 
@@ -714,89 +755,68 @@ msgstr ""
 "Sommige bestanden zijn aangepast, maar niet opgeslagen...\n"
 "Wilt u deze opslaan voor u de map verlaat?"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"De ingevoerde map is onjuist!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "Fout..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 #, fuzzy
 msgid "<All albums>"
 msgstr "Albums"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, 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:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "Artiest"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "Albums"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "Bestanden"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Ga naar bovenliggende map"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Geef een map in om te bekijken."
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Boomstructuur"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "Artiest & Album"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "Map hernoemen"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "De map '%s' hernoemen naar:"
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "Gebruik masker: "
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 #, 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:3236
+#: src/browser.c:3263
 #, fuzzy
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
@@ -805,22 +825,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:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "Onjuist verwerkingsmasker"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 #, fuzzy
 msgid "Rename directory preview..."
 msgstr "Voorbeeld hernoemen..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Fout..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "Je moet wel een naam invoeren!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -848,7 +878,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -857,7 +887,7 @@ msgstr ""
 "De map kan niet hernoemd worden omdat de mapnaam al bestaat!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -872,51 +902,51 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "Map hernoemd"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Programma: "
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 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:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "Openen met..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 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:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "Je moet wel een programmanaam invoeren!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, fuzzy, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Kan '%s' (%s) niet uitvoeren\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "Kan geen proces afsplitsen!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Commando uitgevoerd: '%s %s'"
@@ -1006,7 +1036,7 @@ msgstr "Zoeken in: "
 msgid "All Fields"
 msgstr "Alle velden"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Andere"
 
@@ -1081,7 +1111,7 @@ msgstr "Categorieën"
 msgid "Results :"
 msgstr "Resultaten: "
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "Zoeken: "
 
@@ -1110,7 +1140,7 @@ msgstr "Alle lijnen deselecteren"
 msgid "Invert lines selection"
 msgstr "Lijnselectie omkeren"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "Alle lijnen selecteren"
 
@@ -1135,15 +1165,15 @@ msgstr "Plaats in: "
 msgid "All"
 msgstr "Alles"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "Bestandsnaam"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "Titel"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "Jaar"
 
@@ -1155,12 +1185,12 @@ msgstr "Tracknr."
 msgid "# Tracks"
 msgstr "Aantal tracks"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "Genre"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Verwerk ieder bestand met huidige instellingen"
 
@@ -1172,7 +1202,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1185,87 +1215,87 @@ msgstr ""
 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:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Klaar om te zoeken..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, 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:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Selectie omkeren"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Sorteer lijst volgens tracknummer"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Sorteer lijst volgens titel"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Opzoeken '%s'..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Kan host '%s' (%s) niet vinden"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, 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:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Bezig met verbinden naar '%s', poort '%d' ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Kan geen verbinding maken met '%s' (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Verbonden met '%s'"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Bezig met inlezen resultaten (%s)..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, 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:1765
+#: src/cddb.c:1770
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Kan bestand '%s' (%s) niet openen\n"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Kan bestand '%s' (%s) niet openen"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "Bezig met opzoeken ..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Kan niet opzoeken (%s)!"
@@ -1274,92 +1304,92 @@ msgstr "Kan niet opzoeken (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "Bezig met inlezen resultaten ..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "De server gaf een verkeerd antwoord! (%s)"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "De server gaf een verkeerd antwoord! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr ""
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "%d passende albums gevonden"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Bezig met inlezen resultaten (%s)..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Bezig met inlezen resultaten (%s)..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 #, 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, fuzzy, c-format
 msgid "%d file(s) selected!"
 msgstr "%u bestanden"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Klaar om te zoeken..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, 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:3231
+#: src/cddb.c:3268
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "%d passende albums gevonden"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, 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:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "Inlezen van albumtracklijst ..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1372,7 +1402,7 @@ msgstr ""
 "\n"
 "Wilt u verder gaan?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "Schrijf tag van CDDB..."
 
@@ -1650,11 +1680,11 @@ msgstr "Bestand niet gevonden"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
@@ -1662,7 +1692,7 @@ msgstr "?, Layer ?"
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1670,17 +1700,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Freq:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mode:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1865,14 +1895,14 @@ msgid "Tag selected files with these pictures"
 msgstr "Gebruik deze titel voor geselecteerde bestanden"
 
 #: src/easytag.c:1045
+msgid "Add pictures to the tag (drag and drop is also available)."
+msgstr ""
+
+#: src/easytag.c:1051
 #, fuzzy
 msgid "Remove selected pictures, else all pictures."
 msgstr "URL van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1051
-msgid "Add pictures to the tag (drag and drop is also available)."
-msgstr ""
-
 #: src/easytag.c:1061
 #, fuzzy
 msgid "Save the selected pictures on the hard disk."
@@ -2257,7 +2287,7 @@ msgstr "Verwijder bestand..."
 msgid "File '%s' deleted"
 msgstr "Bestand '%s' gewist"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2269,109 +2299,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "Bezig met zoeken..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "Bestand: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "%d bestanden gevonden in deze map en submappen"
 
-#: src/easytag.c:3235
+#: src/easytag.c:3239
 #, 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:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u bestanden"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr "Deze map en de submappen bevatten geen bestanden!"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "Deze map bevat geen bestanden!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Bezig met zoeken..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "  STOP met zoeken...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "Voer een mapnaam in om te bekijken."
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "Gebruik dit veld voor geselecteerde bestanden"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Converteer '_' en '%20' naar spaties"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "Converteer ' ' naar '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "Allemaal hoofdletters"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "Allemaal kleine letters"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "Eerste letter hoofdletter"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "Iedere eerste letter hoofdletter"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "Verwijder spaties"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Voeg spatie toe voor iedere hoofdletter"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 msgid "Remove duplicate spaces or underscores"
 msgstr "Verwijder dubbele spaties of underscores"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: afgebroken! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, fuzzy, c-format
-msgid "Received signal %s (%d)"
-msgstr "Signaal ontvangen: %s (%d)\n"
+msgid "Received signal %s (%d)\a"
+msgstr "Signaal ontvangen: %s (%d)\a\n"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 #, fuzzy
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
@@ -2382,12 +2412,12 @@ msgstr ""
 "met debuginformatie ('gdb easytag core' gevolgd door 'bt' en 'l') te zenden "
 "naar easytag@gmail.com"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Onbekend signaal"
 
-#: src/easytag.c:4466
-#, fuzzy
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2400,8 +2430,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2420,11 +2449,11 @@ msgstr ""
 "., ./                  De huidige map laden.\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: normaal afgesloten! Tot ziens..."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2432,7 +2461,7 @@ msgstr ""
 "Sommige bestanden zijn aangepast maar niet opgeslagen...\n"
 "Wilt u deze opslaan voor u het programma verlaat?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr " Wilt u EasyTAG werkelijk verlaten?"
 
@@ -2531,7 +2560,7 @@ msgstr ""
 "naar systeemcodering (Probeer de \n"
 "omgevingsvariabele G_FILENAME_ENCODING eens in te stellen): '%s'"
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "Bestandsnaam vertalingen"
 
@@ -2565,7 +2594,7 @@ msgstr "Wijzigingen"
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "FOUT tijdens het openen van bestand: '%s' (%s).\n"
-""
+"\a"
 
 #: src/flac_tag.c:983 src/ogg_tag.c:752
 #, c-format
@@ -2694,123 +2723,123 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "Selecteer bestand..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " OK "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " Ja "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " Nee "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " Toepassen "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " Opslaan "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " Annuleren "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " Sluiten "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " Opslaan "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " Uitvoeren "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr " Zoeken "
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr "Bladeren..."
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "Selecteer map..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "Selecteer bestand..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 #, fuzzy
 msgid "Warning..."
 msgstr "Bezig met zoeken..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, 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:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "Creëer playlist"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "M3U-playlistnaam"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "Gebruik mapnaam"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Bewerk maskers"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "Playlist-instellingen"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Alleen geselecteerde bestanden meetellen"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2818,30 +2847,30 @@ msgstr ""
 "Indien waar, zullen alleen de geselecteerde bestanden in de afspeellijst "
 "gezet worden, anders wordt alles toegevoegd."
 
-#: src/misc.c:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "Gebruik volledig pad voor bestanden in lijst"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 msgid "Use relative path for files in playlist"
 msgstr "Gebruik relatief pad voor bestanden in lijst"
 
 #. Create playlist in parent directory
-#: src/misc.c:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "Maak playlist in bovenliggende map"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 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:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "Gebruik DOS directory scheidingsteken"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2849,23 +2878,23 @@ msgstr ""
 "Deze optie vervangt het UNIX directory scheidingsteken '/' door dat van DOS "
 "'\\'."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "Playlist inhoud"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "Bewaar enkel lijst met bestanden"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "Gebruik bestandsnaam om te bewaren"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Bewaar info gebruik makend van: "
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2874,12 +2903,12 @@ msgstr ""
 "Playlist bestand '%s' bestaat reeds!\n"
 "Overschrijven?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "Sla playlist op..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2888,109 +2917,144 @@ msgstr ""
 "Kan playlist niet opslaan in bestand: %s!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Playlist weggeschreven van '%s'"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 #, fuzzy
 msgid "CD"
 msgstr "CDDB"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "Track"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Commentaar"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 #, fuzzy
 msgid "Composer"
 msgstr "Componist:"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 #, fuzzy
 msgid "Orig. Artist"
 msgstr "Orig. artiest:"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 #, fuzzy
 msgid "Copyright"
 msgstr "Copyright:"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 #, fuzzy
 msgid "Encoded by"
 msgstr "Encoded door:"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "Zoek bestand"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "In :"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 #, 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:1987
+#: src/misc.c:2033
 #, fuzzy
 msgid "the Tag"
 msgstr "Tag op opslaan..."
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "%d bestanden gevonden"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "Laad bestandsnamen uit tekstbestand"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 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:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr "Laden "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "Inhoud van het ingelezen bestand: "
+#: src/misc.c:2810
+#, 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:2831 src/misc.c:2925
+#, 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:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Lijn wissen"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "Lijst met bestandsnamen"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "Wis alle lege lijnen"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, 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:2870 src/misc.c:2964
+#, 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:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Herladen"
 
-#: src/misc.c:2828
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Bewaar enkel lijst met bestanden"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Alle lijnen selecteren"
+
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2998,21 +3062,23 @@ msgstr ""
 "Deze optie zorgt ervoor dat de bestanden worden verwerkt zodra de "
 "bestandsnamen zijn ingelezen (het verwerkingsvenster moet geopend zijn)."
 
-#: src/misc.c:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "Witregel invoegen"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "Lijn wissen"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "Wis alle lege lijnen"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Verplaats masker naar boven in lijst"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "Herladen"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Verplaats masker naar beneden in lijst"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3148,127 +3214,127 @@ msgstr ""
 msgid "Save file..."
 msgstr "Selecteer bestand..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr ""
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr ""
 
-#: src/picture.c:789
+#: src/picture.c:790
 #, fuzzy
 msgid "Unknown image"
 msgstr "Onbekend signaal"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr ""
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr ""
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr ""
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr ""
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr ""
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr ""
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr ""
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr ""
 
-#: src/picture.c:816
+#: src/picture.c:817
 #, fuzzy
 msgid "Conductor"
 msgstr "Country"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr ""
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr ""
 
-#: src/picture.c:824
+#: src/picture.c:825
 #, fuzzy
 msgid "Recording location"
 msgstr "Aflopend op duratie"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr ""
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr ""
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr ""
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr ""
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr ""
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr ""
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr ""
 
-#: src/picture.c:840
+#: src/picture.c:841
 #, fuzzy
 msgid "Unknown picture type"
 msgstr "Onbekend veldtype"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 #, fuzzy
 msgid "pixels"
 msgstr "Velden"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr ""
 
-#: src/picture.c:881
+#: src/picture.c:882
 #, fuzzy
 msgid "Description"
 msgstr "Beschrijving:"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
 msgstr ""
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr ""
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, fuzzy, c-format
 msgid ""
 "Can't open file :\n"
@@ -3276,7 +3342,7 @@ msgid ""
 "(%s)"
 msgstr "Kan bestand '%s' (%s) niet openen\n"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr ""
 
@@ -3531,25 +3597,53 @@ msgstr ""
 "mogelijk om extra argumenten mee te geven, bv. 'xmms -p'.  Vervolgens wordt "
 "de bestandsnaam als extra argument meegegeven."
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Tag instellingen"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "Gecentreerd op het scherm"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr ""
+"Wanneer ingeschakeld zal de playlist bewaard worden in de bovenliggende map."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 #, fuzzy
 msgid "File Settings"
 msgstr "_Instellingen"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 #, fuzzy
 msgid "File Options"
 msgstr "Bestandsnaam instellingen"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr "Vervang ongeldige tekens in bestandsnaam (voor Windows en CD-ROM)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3563,52 +3657,52 @@ msgstr ""
 "verwerkingsvenster."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "Bestandsextensie omzetten naar:"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "Kleine letters"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "De extensie wordt dan bijvoorbeeld '.mp3'"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "Hoofdletters"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "De extensie wordt dan bijvoorbeeld '.MP3'"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "Onveranderd"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "De extensie zal niet veranderd worden"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr ""
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3619,48 +3713,48 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 #, fuzzy
 msgid "Character Set for File Name"
 msgstr "Codering voor ID3-tags."
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
 msgstr ""
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr ""
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "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 ""
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
 "looking characters."
 msgstr ""
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3669,20 +3763,20 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "Tags"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "Tag instellingen"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "Datum vervolledigen als deze niet compleet is"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3692,11 +3786,11 @@ msgstr ""
 "invoert (bv. huidige jaar is 2005: 5 => 2005, 4 => 2004, 6 => 1996, 95 => "
 "1995, ...)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "Bewaar tracknummer met vast aantal cijfers: "
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3706,11 +3800,11 @@ msgstr ""
 "wordt opgeslagen door voorloopnullen toe te voegen. Zonder deze optie wordt "
 "het originele formaat behouden."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Ogg Vorbis bestanden: sla commentaar ook op in XMMS-formaat"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3724,17 +3818,17 @@ msgstr ""
 "andere programma's waarschuwingen geven over onbekende velden.  XMMS zal dan "
 "echter geen commentaren vinden."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr ""
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr ""
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr ""
 
@@ -3742,23 +3836,23 @@ msgstr ""
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 #, fuzzy
 msgid "ID3 Tag Settings"
 msgstr "Tags"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "ID3-tags"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 #, fuzzy
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "ID3-tags in FLAC-bestanden zetten met FLAC-tag"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3767,11 +3861,11 @@ msgstr ""
 "Anders worden deze verwijderd."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "Verwijder ID3-tags wanneer alle velden leeg zijn."
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3783,11 +3877,11 @@ msgstr ""
 "om de hele tag te verwijderen wanneer die zeven standaardvelden leeg zijn."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Automatisch omzetten van oude ID3v2-tags"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3796,42 +3890,42 @@ msgstr ""
 "naar ID3v2.3."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 #, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "Gebruik ID3v2-tags"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Codering voor ID3-tags."
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Gebruik ID3v2-tags"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "Gebruik ID3v2-tags"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3841,12 +3935,12 @@ msgstr ""
 "toegevoegd. Anders wordien zij verwijderd."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 #, fuzzy
 msgid "Version:"
 msgstr "Beschrijving:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3855,57 +3949,57 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Encoded door:"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 #, 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:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 #, fuzzy
 msgid "No"
 msgstr " Nee "
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ID3-tag"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "Gebruik ID3v1.x-tags"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3913,22 +4007,22 @@ msgstr ""
 "Wanneer aangevinkt, zullen er aan de MP3 bestanden ID3v1-tags worden "
 "toegevoegd. Anders worden zij verwijderd."
 
-#: src/prefs.c:846
+#: src/prefs.c:878
 #, 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:878
+#: src/prefs.c:910
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Codering voor ID3-tags."
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3945,7 +4039,7 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:914
+#: src/prefs.c:947
 #, fuzzy
 msgid "Character set used to read tag data in the file."
 msgstr "Karakterset voor weergave op het scherm."
@@ -3953,24 +4047,24 @@ msgstr "Karakterset voor weergave op het scherm."
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Verwerkingsvenster"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Verwerkingsvenster - Tekenconversie"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Converteer '_' en '%20' naar spatie ' '"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Converteer spatie ' ' naar underscore '_'"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -3979,11 +4073,11 @@ msgstr ""
 "toepassen van een masker op tags."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Bestanden hernoemen - Tekenconversie"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -3992,18 +4086,18 @@ msgstr ""
 "toepassen van een masker op bestandsnamen."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Cosmetisch - Tekenconversie"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1001
+#: src/prefs.c:1034
 #, 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:1005
+#: src/prefs.c:1038
 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 "
@@ -4012,25 +4106,25 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Verwerkingsvenster"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Verwerkingsvenster openen bij starten"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 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:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Verwerkingsvenster altijd bovenop"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4039,16 +4133,16 @@ msgstr ""
 "hoofdvenster."
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "Velden"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Overschrijf velden bij het verwerken van de bestanden"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4057,11 +4151,11 @@ msgstr ""
 "door de nieuwe tekst.  Wanneer uitgeschakeld, worden alleen de lege velden "
 "gevuld."
 
-#: src/prefs.c:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "Gebruik deze tekst als standaard voor het commentaarveld :"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4069,11 +4163,11 @@ msgstr ""
 "Wanneer ingeschakeld wordt standaard deze tekst gebruikt als commentaar."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 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:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4084,46 +4178,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr ""
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Automatisch zoeken"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "Naam: "
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "Poort: "
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "CGI-pad: "
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Instellingen server"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "Doorzoek CDDB"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 #, fuzzy
 msgid "Path :"
 msgstr "CGI-pad: "
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4132,66 +4226,66 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Proxy"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Gebruik een proxyserver"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Activeer de instellingen van de proxyserver."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "Computernaam: "
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Naam van de proxyserver."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Poort van de proxyserver."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "Gebruikersnaam: "
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "Naam van de gebruiker van de proxyserver."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "Wachtwoord: "
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 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:1309
+#: src/prefs.c:1342
 #, fuzzy
 msgid "Track Name List"
 msgstr "Titel"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4200,67 +4294,71 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Bevestiging"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Bevestiging voor het afsluiten van EasyTAG"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 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:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "Bevestiging voor het opslaan van tags"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "Bevestiging voor het hernoemen van bestanden"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "Bevestiging voor het wissen van bestanden"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "Bevestiging voor het opslaan van playlists"
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Veranderingen toepassen (maar niet opslaan!) en sluit dit venster"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "Sluit dit venster zonder de veranderingen op te slaan"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 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:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "Veranderingen toegepast"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "Voorkeuren opgeslagen"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "Voorkeuren onveranderd"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4271,11 +4369,11 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "Het is geen map"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
@@ -4293,36 +4391,36 @@ msgstr "Map hernoemen"
 msgid "Process Fields"
 msgstr "Cosmetisch"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "Tag succesvol verwerkt..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Tag succesvol verwerkt...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, 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:660
+#: src/scan.c:663
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Kan bestandsnaam '%s' niet omzetten naar systeemcodering."
 
-#: src/scan.c:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "Nieuw bestand succesvol verwerkt..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nieuw bestand succesvol verwerkt...(%s)"
@@ -4330,41 +4428,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "Bewerk tags en bestandsnamen"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Bewerking:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "Selecteer de bewerking"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Open verwerkingsvenster / Geselecteerde bestanden verwerken"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Instellingen verwerkingsvenster"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Verbergen / Weergeven maskerbewerking"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Verbergen / Weergeven legenda"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "Sluit dit venster"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4373,15 +4471,15 @@ msgstr ""
 "te vullen vanuit de bestandsnamen"
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "Voorbeeld van ingevulde tag..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 #, fuzzy
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
@@ -4393,15 +4491,15 @@ msgstr ""
 "bestandsnaam aan te passen op basis van de tag."
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "Voorbeeld hernoemen..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Selecteer velden:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4410,131 +4508,131 @@ msgstr ""
 "worden. Selecteer degene die u interesseren."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "B"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "Bestandsnaam veld"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "Titel veld"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "Artiest veld"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Album veld"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "Verwerk genre veld"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Componist veld"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 #, fuzzy
 msgid "Process original artist field"
 msgstr "Artiest veld"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 #, fuzzy
 msgid "Cr"
 msgstr "C"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 #, fuzzy
 msgid "Process copyright field"
 msgstr "Commentaar veld"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr ""
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 #, fuzzy
 msgid "Process URL field"
 msgstr "Titel veld"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr ""
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 #, fuzzy
 msgid "Process encoder name field"
 msgstr "Bestandsnaam veld"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Selectie omkeren"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Selecteer alles/niets."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Vervang '_' en '%20' door ' '"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Zet om :"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "naar : "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4542,7 +4640,7 @@ msgstr ""
 "Converteer '_' en '%20' naar spaties (bv: 'Een%20stukje_Tekst' wordt 'Een "
 "stukje Tekst')."
 
-#: src/scan.c:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4550,11 +4648,12 @@ msgstr ""
 "De spatie wordt vervangen door een underscore (bv: 'Een stukje tekst' wordt "
 "'Een_stukje_tekst')."
 
-#: src/scan.c:2171
-msgid "Replace a character by an other one."
-msgstr "Vervang een teken door een ander."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4562,7 +4661,7 @@ msgstr ""
 "Alle letters worden hoofdletters (bv 'Een STUKJE tekst' wordt 'EEN STUKJE "
 "TEKST')."
 
-#: src/scan.c:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4570,7 +4669,7 @@ msgstr ""
 "Alle letters worden hoofdletters (bv 'Een STUKJE tekst' wordt 'EEN STUKJE "
 "TEKST')."
 
-#: src/scan.c:2209
+#: src/scan.c:2325
 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'."
@@ -4578,7 +4677,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:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4586,22 +4685,22 @@ 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:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Voeg een spatie in voor iedere hoofdletter"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "Verwijder dubbele spaties en underscores"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 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:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4609,7 +4708,7 @@ msgstr ""
 "Voor iedere hoofdletter wordt een spatie geplaatst. (bv: 'EenStukjeTekst' "
 "wordt 'Een Stukje Tekst')."
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4620,185 +4719,185 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artiest"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : commentaar"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, fuzzy, c-format
 msgid "%p : composer"
 msgstr "%c : commentaar"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr ""
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr ""
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, fuzzy, c-format
 msgid "%e : encoded by"
 msgstr "Encoder:"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genre"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : genegeerd"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l: aantal tracks"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, fuzzy, c-format
 msgid "%o : orig. artist"
 msgstr "%a : artiest"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : tracknummer"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : titel"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr ""
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : jaar"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Maskerbewerking"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "Maak nieuw masker"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Verplaats masker naar boven in lijst"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Verplaats masker naar beneden in lijst"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Kopieer Masker"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Voeg standaardmaskers toe"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "Verwijder masker"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Sla maskers op"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "Nieuw masker"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "Kopiëren: Geen rij geselecteerd!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "Verwijderen: Geen rij geselecteerd!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Naar boven: Geen rij geselecteerd!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Naar beneden: Geen rij geselecteerd!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "FOUT: Kan voorkeuren niet opslaan: %s (%s)"
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Kan voorkeuren niet openen '%s' (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "Voorkeuren worden geladen..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, fuzzy, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Kan bestand '%s' (%s) niet openen"
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, 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:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Bezig met laden van standaardmaskers..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "Bezig met laden van standaardmaskers..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 #, fuzzy
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Bezig met laden van standaardmaskers..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "FOUT: De omgevingsvariabele HOME is niet gedefinieerd!\n"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "FOUT: Kan de map '%s' niet aanmaken (%s)!"
@@ -4884,6 +4983,36 @@ msgstr "Beluister nummers"
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "De ingevoerde map is onjuist!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Hoofdlettergevoelig"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Vervang een teken door een ander."
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Inhoud van het ingelezen bestand: "
+
+#~ msgid "Files Name List :"
+#~ msgstr "Lijst met bestandsnamen"
+
+#, fuzzy
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
+
+#, fuzzy
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
+
 #, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "Ongeldige versie van tag"
@@ -4921,10 +5050,10 @@ msgstr ""
 #~ "naar '%s' wordt niet ondersteund!"
 
 #, fuzzy
-#~ msgid "ERROR while opening file: '%s' (%s)"
+#~ msgid "ERROR while opening file: '%s' (%s)\a"
 #~ msgstr ""
 #~ "FOUT tijdens het openen van bestand: '%s' (%s).\n"
-#~ ""
+#~ "\a"
 
 #~ msgid "Load on startup the directory"
 #~ msgstr "Map laden bij opstarten"
@@ -5144,10 +5273,10 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "ERROR while opening file: '%s'(%s).\n"
-#~ ""
+#~ "\a"
 #~ msgstr ""
 #~ "FOUT tijdens het openen van bestand: '%s' (%s).\n"
-#~ ""
+#~ "\a"
 
 #, fuzzy
 #~ msgid "AAC/MPEG-4 File"
@@ -5178,6 +5307,3 @@ msgstr ""
 #, fuzzy
 #~ msgid "(Test translation)"
 #~ msgstr "(Zweedse vertaling)"
-
-#~ msgid "(Not available!)"
-#~ msgstr "(Niet beschikbaar)"
diff --git a/po/pl.gmo b/po/pl.gmo
index 4e23a74..b0df0b8 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 3f71114..e4cc94d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -16,10 +16,10 @@
 # Micha� Smoczyk <msmoczyk@wp.pl>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: EasyTAG 2.1.1\n"
+"Project-Id-Version: EasyTAG-2.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
-"PO-Revision-Date: 2007-07-09 20:45+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
+"PO-Revision-Date: 2007-09-21 18:12+0200\n"
 "Last-Translator: Micha� Smoczyk <msmoczyk@wp.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
@@ -38,185 +38,230 @@ msgstr ""
 "i �adny interfejs sprawia, �e tagowanie plik�w staje si� �atwiejsze pod GNU/"
 "Linuksem."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(Niemieckie t�umaczenie)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(Rosyjskie t�umaczenie)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(Holenderskie t�umaczenie)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(Szwedzkie t�umaczenie)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(W�gierskie t�umaczenie)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(W�oskie t�umaczenie)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(Japo�skie t�umaczenie)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(Ukrai�skie t�umaczenie)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(Czeskie t�umaczenie)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(Hiszpa�skie t�umaczenie)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(Polskie t�umaczenie)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(Rumu�skie t�umaczenie)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(Du�skie t�umaczenie)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(Greckie t�umaczenie)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Brazyliskie Portugalskie t�umaczenie)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(Bu�garskie t�umaczenie)"
 
-#: src/about.c:160
+#: src/about.c:171
 msgid "(Chinese translation)"
 msgstr "(Chi�skie t�umaczenie)"
 
-#: src/about.c:161
+#: src/about.c:172
 msgid "(Hebrew translation)"
 msgstr "(Hebrajskie t�umaczenie)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(Niemieckie t�umaczenie)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+# To musi by� krotkie
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Komentarz"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "Informacje o..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "Informacje o"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(kompilacja: %s)"
 
-#: src/about.c:276
-#, fuzzy, c-format
+#: src/about.c:297
+#, c-format
 msgid "(using: GTK+ %d.%d.%d)"
-msgstr "(u�ywaj�c: GTK+ %d.%d.%d i id3lib %d.%d.%d)"
+msgstr "(u�ywanie: GTK+ %d.%d.%d)"
 
-#: src/about.c:283
+#: src/about.c:305
 #, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(Wsparcie dla plik�w MP3 w��czone z u�yciem: libid3tag %s)"
+msgid "Author: %s"
+msgstr "Autor: %s"
 
-#: src/about.c:287
+#: src/about.c:309 src/easytag.c:212
 #, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(Wsparcie tag�w ID3v2.3 w��czone z u�yciem: id3lib %d.%d.%d)"
+msgid "E-mail: %s"
+msgstr "E-mail: %s"
 
-#: src/about.c:292
-msgid "(ID3v2.3 tags  support disabled)"
-msgstr "(Wsparcie dla tag�w ID3v2.3 wy��czone)"
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Strona WWW: "
 
-#: src/about.c:296
+#: src/about.c:328
+msgid "Description:"
+msgstr "Opis:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
 #, c-format
-msgid "(MP3 file support disabled)"
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
+#, fuzzy
+msgid "MP3 file support"
 msgstr "(Wsparcie dla plik�w MP3 wy��czone)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
+#, c-format
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
+msgstr "(Wsparcie dla tag�w ID3v2.3 wy��czone)"
+
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "Brak dost�pnej pami�ci"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(Wsparcie dla plik�w Ogg Vorbis wy��czone)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(Wsparcie dla plik�w Speex wy��czone)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(Wsparcie dla plik�w FLAC wy��czone)"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
 msgstr "(Wsparcie dla plik�w MP4/AAC wy��czone)"
 
-#: src/about.c:322
-msgid "(WavPack file support disabled)"
+#: src/about.c:460
+#, fuzzy
+msgid "WavPack file support"
 msgstr "(Wsparcie dla plik�w WavPack wy��czone)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "Autor: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-mail: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Strona WWW: "
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "Opis:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "Podzi�kowania"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "T�umaczenia:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "Og�lne:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "Zmiany"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -337,11 +382,11 @@ msgstr "Malej�co wed�ug praw autorskich"
 
 #: src/bar.c:173
 msgid "Ascending by URL"
-msgstr "Rosn�co wed�ug URL'a"
+msgstr "Rosn�co wed�ug URLa"
 
 #: src/bar.c:174
 msgid "Descending by URL"
-msgstr "Malej�co wed�ug URL'a"
+msgstr "Malej�co wed�ug URLa"
 
 #: src/bar.c:175
 msgid "Ascending by encoder name"
@@ -549,7 +594,7 @@ msgstr "Zmie� nazw� katalogu..."
 msgid "Reload Directory"
 msgstr "Ponownie wczytaj katalog"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "Przegl�daj katalog za pomoc�..."
 
@@ -579,7 +624,7 @@ msgstr "Zmie� nazw� pliku/katalogu ..."
 
 #: src/bar.c:222
 msgid "Rename File(s) and Directory ..."
-msgstr "Zmie� nazw� pliku/katalogu"
+msgstr "Zmie� nazw� pliku/katalogu..."
 
 #: src/bar.c:223
 msgid "_Process Field(s) ..."
@@ -663,7 +708,7 @@ msgstr "Szukaj pliku w CDDB..."
 #. { 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:257
 msgid "Clean Log"
-msgstr ""
+msgstr "Wyczy�� dziennik"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
 #: src/bar.c:264
@@ -695,7 +740,7 @@ msgstr "Wybrano now� domy�ln� �cie�k� do plik�w"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Potwierd�..."
 
@@ -707,86 +752,65 @@ msgstr ""
 "Cz�� plik�w zosta�a zmodyfikowana ale zmiany nie zosta�y zapisane.\n"
 "Czy zapisa� te zmiany przed zmian� katalogu?"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"Wprowadzona �cie�ka jest nieprawid�owa!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "B��d..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 msgid "<All albums>"
 msgstr "<Wszystkie albumy>"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, 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:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "Artysta"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# Album"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# Pliki"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Id� do katalogu nadrz�dnego"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Podaj katalog do przegl�dania."
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Drzewo"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "Artysta i Album"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "Zmiana nazwy katalogu"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Zmiana nazwy katalogu \"%s\" na: "
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
-msgstr "Maska: "
+msgstr "Maska : "
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 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:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -794,21 +818,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:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "Nieprawid�owa maska skanera"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "Podgl�d zmiany nazwy katalogu..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "B��d..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "Musisz wprowadzi� nazw� katalogu!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -837,7 +871,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -846,7 +880,7 @@ msgstr ""
 "Zmiana nazwy katalogu nie jest mo�liwa. Katalog ju� istnieje!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -861,50 +895,50 @@ msgstr ""
 "\"%s\"!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "Nazwa katalogu zmieniona"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Program do uruchomienia : "
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 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:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "Otw�rz plik za pomoc� ..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 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:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "Musisz poda� nazw� programu!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Aplikacja \"%s\" nie zosta�a znaleziona!"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Nie mo�na uruchomi� %s (b��d %d)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "Nie mo�na utworzy� procesu potomnego!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Wykonano polecenie: \"%s %s\""
@@ -951,7 +985,7 @@ msgstr ""
 
 #: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
-msgstr "Zatrzymaj wyszukiwanie ...  "
+msgstr "Zatrzymaj wyszukiwanie ..."
 
 #. Check box to run the scanner
 #: src/cddb.c:311
@@ -987,13 +1021,13 @@ msgstr ""
 #.
 #: src/cddb.c:426
 msgid "Search In :"
-msgstr "Wyszukiwanie w: "
+msgstr "Wyszukiwanie w : "
 
 #: src/cddb.c:434
 msgid "All Fields"
 msgstr "Wszystkie pola"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Inne"
 
@@ -1066,11 +1100,11 @@ msgstr " Kategorie "
 #.
 #: src/cddb.c:522
 msgid "Results :"
-msgstr "Wyniki: "
+msgstr "Wyniki : "
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
-msgstr "Szukaj: "
+msgstr "Szukaj : "
 
 #: src/cddb.c:542
 msgid "Enter the words to search in the list below"
@@ -1086,7 +1120,7 @@ msgstr "Szukaj poprzedni"
 
 #: 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'"
+msgstr "Pokazuje czerwone / wszystkie linie na li�cie \"Artysta / Album\""
 
 #: src/cddb.c:577 src/cddb.c:1503
 msgid "Unselect all lines"
@@ -1096,7 +1130,7 @@ msgstr "Odznacza wszystkie linie"
 msgid "Invert lines selection"
 msgstr "Odwraca zaznaczenie linii"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "Zaznacz wszystkie linie"
 
@@ -1116,21 +1150,21 @@ msgstr ""
 #.
 #: src/cddb.c:712
 msgid "Set Into :"
-msgstr "Ustaw w: "
+msgstr "Ustaw w : "
 
 #: src/cddb.c:719
 msgid "All"
 msgstr "Wszystkie"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "Nazwa pliku"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "Tytu�"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "Rok"
 
@@ -1142,12 +1176,12 @@ msgstr "# �cie�ki"
 msgid "# Tracks"
 msgstr "# �cie�ek"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "Gatunek"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Uruchom skaner dla ka�dego pliku"
 
@@ -1159,7 +1193,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1177,11 +1211,11 @@ msgstr ""
 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:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Gotowy do wyszukiwania..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1189,76 +1223,76 @@ msgstr ""
 "Album \"%s\", artysta: \"%s\", d�ugo��: \"%s\", rok: \"%s\", gatunek: \"%s"
 "\", ID: \"%s\""
 
-#: src/cddb.c:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Odwr�� zaznaczenie"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Sortuj wed�ug numeru �cie�ki"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Sortuj wed�ug nazwa �cie�ki"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Wyszukiwanie serwera \"%s\" ..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Nie mo�na znale�� serwera \"%s\" (%s)!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, 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:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "��czenie z serwerem \"%s\", port \"%d\" ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Nie mo�na po��czy� si� z serwerem \"%s\" (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Po��czony z serwerem \"%s\""
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Odbieranie danych (%s) ..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "B��d podczas odczytywania odpowiedzi CDDB: %s!"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Nie mo�na utworzy� pliku \"%s\" (%s)"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Nie mo�na otworzy� pliku \"%s\" (%s)"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "Wysy�anie zapytania ..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Nie mo�na wys�a� zapytania (%s)!"
@@ -1267,63 +1301,62 @@ msgstr "Nie mo�na wys�a� zapytania (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "Odbieranie danych ..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 msgid "The server returned a wrong answer!"
 msgstr "Serwer zwr�ci� z�� odpowied�!"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Serwer zwr�ci� z�� odpowied�! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Przykro mi, przeszukiwanie www nie dzia�a w tym momencie!"
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Znaleziono %d pasuj�cy(ch) album(�w)"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Odbieranie danych ze strony %d (album %d/%d) ..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Odbieranie danych ze strony %d ..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr "Wi�cej wynik�w do za�adowania ..."
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 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:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d plik�w zaznaczonych!"
 
-#: src/cddb.c:2945
-#, fuzzy
+#: src/cddb.c:2970
 msgid "Local CD search..."
 msgstr "Gotowy do wyszukiwania..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
@@ -1332,27 +1365,27 @@ msgstr ""
 "Wprowad� j� w oknie ustawie�."
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, 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:3231
+#: src/cddb.c:3268
 #, 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:3327
+#: src/cddb.c:3364
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Nie mo�na otworzy� pliku \"%s\" (%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "Wczytywanie listy �cie�ek albumu ..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1364,7 +1397,7 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuowa� ?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "Zapisz tagi z CDDB..."
 
@@ -1588,12 +1621,12 @@ msgstr "U�ywanie id3lib w wersji %d.%d.%d ..."
 #: src/easytag.c:189
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
-msgstr "Zmienna EASYTAGLANG zdefiniowana. Ustawiam locale : '%s'"
+msgstr "Zmienna EASYTAGLANG zdefiniowana. Ustawiam locale : \"%s\""
 
 #: src/easytag.c:191
-#, fuzzy, c-format
+#, c-format
 msgid "Setting locale : '%s'"
-msgstr "Zmiana nazwy pliku \"%s\""
+msgstr "Ustawiam locale : \"%s\""
 
 #: src/easytag.c:195
 #, c-format
@@ -1613,7 +1646,7 @@ msgstr "Strona WWW: %s"
 #: src/easytag.c:288
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
-msgstr "Nieznany parametr lub �cie�ka '%s'\n"
+msgstr "Nieznany parametr lub �cie�ka \"%s\"\n"
 
 #.
 #. * Browser
@@ -1636,11 +1669,11 @@ msgstr "Uszkodzony odno�nik do pliku"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Warstwa ?"
 
@@ -1649,7 +1682,7 @@ msgstr "?, Warstwa ?"
 msgid "Bitrate:"
 msgstr "Pr�bkowanie:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1657,17 +1690,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Cz�stotliwo��:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Tryb:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1734,7 +1767,6 @@ msgid "CD:"
 msgstr "CD:"
 
 #: src/easytag.c:658
-#, fuzzy
 msgid "Tag selected files with this disc number"
 msgstr ""
 "Numer dysku z tego pola zostanie wstawiony do pozosta�ych zaznaczonych plik�w"
@@ -1813,12 +1845,13 @@ msgstr ""
 #. Original Artist / Performer
 #: src/easytag.c:837
 msgid "Orig. Artist:"
-msgstr "Artysta:"
+msgstr "Oryginalny artysta:"
 
 #: src/easytag.c:849
 msgid "Tag selected files with this original artist"
 msgstr ""
-"Artysta z tego pola zostanie wstawiony do pozosta�ych zaznaczonych plik�w"
+"Oryginalny artysta z tego pola zostanie wstawiony do pozosta�ych "
+"zaznaczonych plik�w"
 
 #. Copyright
 #: src/easytag.c:856
@@ -1872,14 +1905,14 @@ msgid "Tag selected files with these pictures"
 msgstr "Wstaw dane obrazy do pozosta�ych zaznaczonych plik�w"
 
 #: src/easytag.c:1045
+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:1051
 msgid "Remove selected pictures, else all pictures."
 msgstr ""
 "Usu� zaznaczone obrazy, w przypadku braku zaznaczenia usu� wszystkie obrazy."
 
-#: src/easytag.c:1051
-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:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "Zapisz zaznaczone obrazy na twardym dysku."
@@ -2012,7 +2045,7 @@ msgstr "Usuni�to URL z zaznaczonych plik�w."
 #: src/easytag.c:1492
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
-msgstr "Zaznaczonym plikom ustawiono imi� koduj�cego na \"%s\"."
+msgstr "Zaznaczonym plikom ustawiono koder na \"%s\"."
 
 #: src/easytag.c:1494
 msgid "Removed encoder name from selected files."
@@ -2033,7 +2066,7 @@ msgstr "Wybierz tryb i mask�, po czym ponownie wybierz t� komend�"
 # TODO
 #: src/easytag.c:1825
 msgid "All tags have been scanned"
-msgstr "Wszystkie tagi zosta�y zeskanowane."
+msgstr "Wszystkie tagi zosta�y zeskanowane"
 
 #: src/easytag.c:1882
 msgid "All tags have been removed"
@@ -2257,7 +2290,7 @@ msgstr "Usuni�cie pliku..."
 msgid "File '%s' deleted"
 msgstr "Usuni�to plik \"%s\""
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2269,110 +2302,110 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "Trwa wyszukiwanie..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "Plik: \"%s\""
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, 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:3235
+#: src/easytag.c:3239
 #, 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:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u plik(�w)"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr "Nie znaleziono �adnego pliku w tym katalogu i jego podkatalogach!"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "Nie znaleziono �adnego pliku w tym katalogu!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Wyszukiwanie..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "  ZATRZYMAJ wyszukiwanie...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "Wybierz katalog do przegl�dania!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr ""
 "Warto�� z tego pola zostanie wstawiona do pozosta�ych zaznaczonych plik�w"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Zamiana \"_\" i \"%20\" na spacje"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "Zamiana \" \" na \"_\""
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "Wszystko du�� liter�"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "Wszystko ma�� liter�"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "Du�a pierwsza litera"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "Du�a pierwsza litera ka�dego s�owa"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "Usu� spacje"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Wstawia spacje przed du�� liter�"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 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:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Nienormalne wyj�cie! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, c-format
-msgid "Received signal %s (%d)"
+msgid "Received signal %s (%d)\a"
 msgstr "Otrzymano sygna� %s (%d)"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2382,12 +2415,13 @@ msgstr ""
 "b��dzie z stosem wywo�a� funkcji z gdb (\"gdb easytag core\" potem \"bt\") z "
 "informacj� do easytag@gmail.com (w j�zyku angielskim)"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Nieznany sygna�"
 
 # fixme
-#: src/easytag.c:4466
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2400,8 +2434,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2420,11 +2453,11 @@ msgstr ""
 "., ./                wczytanie obecnego katalogu.\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normalne wyj�cie."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2432,7 +2465,7 @@ msgstr ""
 "Niekt�re pliki zosta�y zmodyfikowane, lecz nie s� zapisane.\n"
 "Czy chcesz je zapisa� przed zako�czeniem programu?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr " Czy na pewno chcesz wyj�� z programu? "
 
@@ -2524,11 +2557,11 @@ msgid ""
 "into system filename encoding\n"
 "(Try setting the environment variable G_FILENAME_ENCODING)."
 msgstr ""
-"Nie mog�em przekonwertowa� nazwy pliku %s\n"
-"Na systemowe kodowanie nazw plik�w\n"
+"Nie mog�em przekonwertowa� nazwy pliku \"%s\"\n"
+"na systemowe kodowanie nazw plik�w\n"
 "(Spr�buj zmieni� warto�� zmiennej systemowej G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "T�umaczenie nazw plik�w"
 
@@ -2701,153 +2734,153 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "Uszkodzony plik..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
-msgstr ""
+msgstr "Dziennik"
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " OK "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " Tak "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " Nie "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " Zastosuj "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " Zapisz "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " Anuluj "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " Zamknij "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " Zapisz "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " Wykonaj "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr " Szukaj "
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
-msgstr "Przegl�daj..."
+msgstr "Przegl�daj... "
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "Wybierz katalog..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "Wybierz plik..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "Warning..."
 msgstr "Ostrze�enie..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr "Brak zdefiniowanego odtwarzacza audio!"
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, 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:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "Utworzenie listy odtwarzania"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "Nazwa listy odtwarzania M3U"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "Nazwa katalogu"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Edytuj maski"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "Opcje listy odtwarzania"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Do��cz tylko zaznaczone pliki"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
 msgstr ""
 "Je�li aktywowane, tylko zaznaczone pliki b�d� zapisywanie do playlisty. W "
-"przeciwnym przypadku, wszystkie pliki b�d� zapisane. "
+"przeciwnym przypadku, wszystkie pliki b�d� zapisane."
 
-#: src/misc.c:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "U�ycie bezwzgl�dnych �cie�ek do plik�w"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 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:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "Utworzenie listy odtwarzania w katalogu nadrz�dnym"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 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:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "U�ycie separatora katalogu DOS"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2855,24 +2888,24 @@ msgstr ""
 "opcja zast�puje separator katalogu UNIKSA \"/\" na znak separatora DOSa \"\\"
 "\"."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "Zawarto�� listy odtwarzania"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "Tylko listy plik�w"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 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:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Dodatkowa informacja z maski:"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2881,12 +2914,12 @@ msgstr ""
 "Lista odtwarzania \"%s\" ju� istnieje!\n"
 "Nadpisa�?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "Zapis listy odtwarzania..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2895,49 +2928,44 @@ msgstr ""
 "Nie mo�na zapisa� listy odtwarzania \"%s\"!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Zapisano list� odtwarzania \"%s\""
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "�cie�ka"
 
-# To musi by� krotkie
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Komentarz"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "Kompozytor"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "Artysta"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "URL"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "Koder"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "Wyszukiwanie pliku"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2945,54 +2973,93 @@ msgstr ""
 "wy�wietli� wszystkie pliki."
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
-msgstr "W: "
+msgstr "W : "
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "znaczniku"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Rozr�nianie wielko�ci liter"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Znaleziono: %d plik(�w)"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "Wczytanie nazw plik�w z pliku TXT"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 msgid "File :"
-msgstr "Plik: "
+msgstr "Plik : "
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " Wczytaj "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "Zawarto�� wczytanego pliku: "
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "Potwierd� zmian� nazwy pliku"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "Wstawia spacj� przed wielka liter�"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Usu� t� lini�"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "Usu� wszystkie puste linie"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "Do��cz tylko zaznaczone pliki"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "Do��cz tylko zaznaczone pliki"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Od�wie�"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Tylko listy plik�w"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "Lista nazw plik�w: "
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Zaznacz wszystkie linie"
 
-#: src/misc.c:2828
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3000,21 +3067,23 @@ msgstr ""
 "Po wczytaniu nazw plik�w zostanie uruchomiony aktualnie wybrany skaner (okno "
 "skanera musi by� otwarte)."
 
-#: src/misc.c:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "Wstaw pusty wiersz"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "Usu� t� lini�"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "Usu� wszystkie puste linie"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Przesu� mask� do g�ry"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "Od�wie�"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Przesu� mask� w d�"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3023,7 +3092,7 @@ msgstr "Profil:"
 
 #: src/mp4_header.c:130
 msgid "Audio"
-msgstr ""
+msgstr "Audio"
 
 #: src/mp4_header.c:131
 #, fuzzy
@@ -3041,7 +3110,7 @@ msgstr "~%d kb/s"
 
 #: src/mpeg_header.c:78
 msgid "Stereo"
-msgstr ""
+msgstr "Stereo"
 
 #: src/mpeg_header.c:79
 msgid "Joint stereo"
@@ -3156,111 +3225,111 @@ msgstr ""
 msgid "Save file..."
 msgstr "Zapis pliku..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "Obraz JPEG"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "Obraz PNG"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "Nieznany obraz"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "Ikona 32x32 pikseli (PNG)"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "Inna ikona"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "Ok�adka (prz�d)"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "Ok�adka (ty�)"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "�rodek ok�adki"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "Media (np. strona z nadrukiem na CD)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "Prowadz�cy artysta/wykonawca/solista"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "Artysta/wykonawca"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "Dyrygent"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "Zesp�/Orkiestra"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "Tek�ciarz/Autor tekst�w"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "Miejsce nagrywania"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "Podczas nagrywania"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "Podczas wyst�pu"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "Zrzut ekranu z filmu/video"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "Jaskrawa pokolorowana ryba"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "Ilustracja"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "Logo zespo�u/artysty"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "Logo wydawcy/studia"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "Nieznany typ obrazu"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "pikseli"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "Typ"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "Opis"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3268,11 +3337,11 @@ msgstr ""
 "Nie mog� wy�wietli� obrazu, poniewa� za ma�a ilo�� danych zosta�a "
 "przeczytana by stwierdzi� jak utworzy� bufor obrazu."
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "Wczytywanie pliku obrazu..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3283,7 +3352,7 @@ msgstr ""
 "\"%s\"!\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "Plik obrazu nie zosta� za�adowany..."
 
@@ -3300,7 +3369,7 @@ msgstr "Drzewo katalog�w"
 #. Label
 #: src/prefs.c:167
 msgid "Default directory :"
-msgstr "Katalog domy�lny"
+msgstr "Katalog domy�lny :"
 
 #: src/prefs.c:179
 msgid ""
@@ -3346,7 +3415,7 @@ msgstr "Rozwini�cie podkatalog�w podczas wybierania katalogu"
 msgid ""
 "This expands the selected node into the file browser to display the sub-"
 "directories."
-msgstr "Automatyczne rozwiniecie podkatalog�w w drzewie po wybraniu katalogu"
+msgstr "Automatyczne rozwiniecie podkatalog�w w drzewie po wybraniu katalogu."
 
 #. Browse hidden directories
 #: src/prefs.c:223
@@ -3396,7 +3465,7 @@ msgstr "Opcje sortowania listy"
 #. Sorting method
 #: src/prefs.c:289
 msgid "Sort the file list by :"
-msgstr "Sortuj list� plik�w: "
+msgstr "Sortuj list� plik�w : "
 
 #. Two columns
 #. Items of option menu
@@ -3524,7 +3593,7 @@ msgstr "Odtwarzacz plik�w audio"
 
 #: src/prefs.c:388
 msgid "Player to run :"
-msgstr "Polecenie: "
+msgstr "Polecenie : "
 
 # FIXME: takie sobie, mo�na by co� z tym zrobi�
 #: src/prefs.c:393
@@ -3535,23 +3604,50 @@ msgstr ""
 "Podaj komend� u�ywan� do odtwarzania plik�w. Mo�na poda� argumenty, kt�re "
 "zostan� przekazane do programu (na przyk�ad \"xmms -p\")."
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Opcje tag�w"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "�rodek okna g��wnego"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr "Utworzenie listy odtwarzania w katalogu nadrz�dnym (o jeden wy�ej)."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "Ustawienia plik�w"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "Opcje nazw plik�w"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr "Zamie� niedozwolone znaki w nazwie pliku (dla Windows i CD-ROM)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3564,40 +3660,40 @@ msgstr ""
 "zmieniania nazw plikom przy u�yciu skanera na podstawie taga."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "Zmie� rozszerzenie pliku na:"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "Ma�e litery"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "Przyk�ad: rozszerzenie pliku zostanie zmienione na \".mp3\""
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "Du�e litery"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "Przyk�ad: rozszerzenie pliku zostanie zmienione na \".MP3\""
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "Bez zmian"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "Rozszerzenie nie zostanie zmienione"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "Zachowaj oryginalny czas modyfikacji pliku"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
@@ -3605,13 +3701,15 @@ msgstr ""
 "zapisywania."
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
+"Aktualizuj czas modyfikacji katalogu nadrz�dnego pliku (polecane kiedy "
+"u�ywasz np. odtwarzacza Amarok)"
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3620,14 +3718,18 @@ msgid ""
 "performance reasons, they refresh file informations by detecting changes of "
 "the parent directory."
 msgstr ""
+"Czas modyfikacji katalogu nadrz�dnego pliku b�dzie zaktualizowany, kiedy tag "
+"pliku jest zapisywany. Ta funkcja jest przydatna kiedy u�ywa si� program�w "
+"takich jak np. Amarok. Z powodu optymalizacji wydajno�ci, programy takie "
+"od�wie�aj� informacje o pliku rozpoznaj�c zmiany w katalogu nadrz�dnym."
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr "Zestaw�w znak�w dla nazw plik�w"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
@@ -3635,11 +3737,11 @@ msgstr ""
 "Zasady do wprowadzenia je�li niekt�re znaki nie mog� by� przekonwertowane na "
 "systemowy zestaw znak�w podczas zapisywania pliku:"
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "Spr�buj innego kodowania znak�w"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
@@ -3647,14 +3749,14 @@ msgid ""
 msgstr ""
 "Z t� opcj�, EasyTAG spr�buje konwersji na kodowanie znak�w przydzielone dla "
 "Twojego j�zyka (np ISO-8859-1 dla \"fr\", KOI8-R dla \"ru\", ISO-8859-2 dla "
-"\"ro\"). Je�li to zawiedzie, ustawione zostanie kodowanie ISO-8859-1."
+"\"ro\"). Je�li to si� nie powiedzie, ustawione zostanie kodowanie ISO-8859-1."
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 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:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3662,41 +3764,41 @@ msgid ""
 msgstr ""
 "Gdy ta opcja jest w��czona i okre�lony znak nie mo�e by� przedstawiony w "
 "docelowym kodowaniu, zostanie on zast�piony podobnie wygl�daj�cym znakiem "
-"(np. \"�\" zostanie zast�pione przez \"l\")"
+"(np. \"�\" zostanie zast�pione przez \"l\")."
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
 "Wymu� u�ywanie systemowego kodowania znak�w i odrzu� nie pasuj�ce znaki "
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
 msgstr ""
 "Ta opcja powoduje, �e znaki kt�re nie mog� zosta� wy�wietlone u�ywaj�c "
-"systemowego kodowania zostan� odrzucone i wyci�te z nazwy pliku"
+"systemowego kodowania zostan� odrzucone i wyci�te z nazwy pliku."
 
 # TODO
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "Ustawienia taga"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "Opcje tag�w"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "Auto-uzupe�nianie danych"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3706,12 +3808,12 @@ msgstr ""
 "przyk�ad, je�li obecny rok to 2005: 5 => 2005, 4 => 2004, 6 => 1996, 95 => "
 "1995, ...)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
-msgstr "Liczba cyfr w polu numer �cie�ki: "
+msgstr "Liczba cyfr w polu numer �cie�ki : "
 
 # TODO
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3720,11 +3822,11 @@ msgstr ""
 "Numer �cie�ki zapisywany jest za pomoc� dw�ch i wi�cej znak�w. W przeciwnym "
 "razie pole numeru �cie�ki nie jest poprawiane."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Pliki Ogg Vorbis: Zapisuj komentarz tak�e w formacie XMMS"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3736,9 +3838,9 @@ msgstr ""
 "Ogg Vorbis. Pole to jest zazwyczaj oznaczonej jako \"comment=\", podczas gdy "
 "XMMS wykorzystuje tylko \"=\". Prosz� odznaczy� t� opcj� je�li nie chcesz "
 "aby inne programy narzeka�y na temat nieznanego pola. Wtedy jednak "
-"komentarze nie b�d� wy�wietlane w XMMS. Nieaktualne dla nowszych XMMS."
+"komentarze nie b�d� wy�wietlane w XMMS. Nieaktualne dla nowszych wersji XMMS."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
@@ -3746,11 +3848,11 @@ msgstr ""
 "Skupienie pola taga podczas zmiany pliku na li�cie u�ywaj�c skr�t�w Page Up/"
 "Page Down:"
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr "Utrzymaj skupienie na tym samym polu"
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr "Zwr�� skupienie na pierwsze pole (tzn. na pole \"Tytu�\")"
 
@@ -3759,21 +3861,21 @@ msgstr "Zwr�� skupienie na pierwsze pole (tzn. na pole \"Tytu�\")"
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "Ustawienia taga ID3"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "Zasady tagowania ID3"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "Zapisuj tagi ID3 w plikach FLAC (opr�cz tag�w FLAC)"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3782,11 +3884,11 @@ msgstr ""
 "pod uwag� tak�e dwie opcje ponad). Inaczej tagi ID3 zostan� odrzucone."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "Usuni�cie tag�w je�li wszystkie pola s� puste"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3799,11 +3901,11 @@ msgstr ""
 "zosta�o wyczyszczonych."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Automatyczne uaktualnienie starszych wersji tag�w ID3v2"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3812,39 +3914,39 @@ msgstr ""
 "wersji ID3v2.3."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr "U�ywaj CRC32"
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "Zapisywanie CRC32 w tagach ID3v2"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr "U�ywaj kompresji"
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr "Ustaw kompresj� tag�w ID3v2"
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 msgid "Character Set for writing ID3 tags"
 msgstr "Zestaw�w znak�w dla zapisu tag�w ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 msgid "ID3v2 tags"
 msgstr "Tagi ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "Zapisywanie tag�w ID3v2"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -3853,11 +3955,11 @@ msgstr ""
 "MP3. W przeciwnym wypadku zostanie usuni�ty."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 msgid "Version:"
 msgstr "Wersja:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3869,54 +3971,52 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr "Zestaw znak�w:"
 
 #. Unicode
-#: src/prefs.c:745
-#, fuzzy
+#: src/prefs.c:777
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:753
-#, fuzzy
+#: src/prefs.c:785
 msgid "Unicode type to use"
-msgstr "Koder"
+msgstr "Metoda kodowania Unikodu"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 msgid "Character set used to write the tag data in the file."
-msgstr "Zestaw znak�w u�ywany do zapisywania tag�w w pliku"
+msgstr "Zestaw znak�w u�ywany do zapisywania tag�w w pliku."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr "Dodatkowe ustawienia dla iconv():"
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 msgid "No"
 msgstr "Nie"
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
-msgstr ""
+msgstr "//TRANSLIT"
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
-msgstr ""
+msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 msgid "ID3v1 tags"
 msgstr "Tagi ID3v1"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "Zapisywanie tag�w ID3v1.x"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3924,20 +4024,20 @@ 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:846
+#: src/prefs.c:878
 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"
+msgstr "Zestaw znak�w u�ywany do zapisywania tag�w ID3v1 w pliku."
 
 #. Character Set for reading tag
-#: src/prefs.c:878
+#: src/prefs.c:910
 msgid "Character Set for reading ID3 tags"
 msgstr "Zestaw�w znak�w dla odczytu tag�w ID3"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr "Niestandardowy:"
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3962,36 +4062,36 @@ msgstr ""
 "musisz: W��czy� t� opcj� i wybra� UTF-8. Musisz tak�e zaznaczy� opcj� "
 "powy�ej \"Spr�buj zapisa� tagi jako ISO-8859-1. Je�li nie jest to mo�liwe, "
 "u�yj UNICODE (zalecane)\" lub \"Zawsze zapisuj tagi jako UNICODE\".\n"
-"   - je�li Unicode nie jest u�ywane, Rosyjscy u�ytkownicy mog� wybra� "
-"Windows-1251 aby odczyta� tagi wpisane pod Windows. Je�li tagi zosta�y "
-"zapisane pod Uniksem, nale�y wybra� \"KOI8-R\"."
+"   - je�li Unicode nie jest u�ywane, rosyjscy u�ytkownicy mog� wybra� "
+"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:914
+#: src/prefs.c:947
 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:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Skaner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Wype�nij tagi - konwersja znak�w"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Zmie� znaki podkre�lenia \"_\" i ci�gi \"%20\" na spacje \" \""
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Zmie� spacje \" \" na podkre�lenia \"_\""
 
 # TODO
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4000,12 +4100,12 @@ msgstr ""
 "skanera dla tag�w."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Zmie� nazw� pliku - konwersja znak�w"
 
 # TODO
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4014,17 +4114,17 @@ msgstr ""
 "skanera dla nazw plik�w."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 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:1001
+#: src/prefs.c:1034
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
-msgstr "Nie zmieniaj pierwszych liter s��w kluczowych na du�e"
+msgstr "Nie zmieniaj pierwszych liter s��w kluczowych na du�e."
 
-#: src/prefs.c:1005
+#: src/prefs.c:1038
 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 "
@@ -4033,44 +4133,44 @@ msgid ""
 msgstr ""
 "Nie zmieniaj pierwszych liter s��w takich jak \"feat.\" na du�e podczas "
 "u�ywania skanera i opcji zmiany pierwszych liter ka�dego s�owa na du�e (np. "
-"zamiast \"Text In An Entry\" otrzymasz \"Text in an Entry\")"
+"zamiast \"Text In An Entry\" otrzymasz \"Text in an Entry\")."
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Okno Skanera"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Otw�rz okno skanera podczas uruchamiania"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr "Automatycznie otwieranie okno skanera podczas uruchamiania EasyTAG."
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Okno skanera zawsze na wierzchu"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 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:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "Pola"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Nadpisywanie p�l podczas przetwarzania taga"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4078,11 +4178,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:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
-msgstr "Ustaw ten tekst jako domy�lny komentarz: "
+msgstr "Ustaw ten tekst jako domy�lny komentarz : "
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4091,11 +4191,11 @@ msgstr ""
 "podczas u�ywania skanera \"Wype�nij znacznik\"."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 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:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4106,42 +4206,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "Baza danych CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 msgid "Server Settings for Automatic Search"
 msgstr "Ustawienia serwera dla automatycznego wyszukiwania"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
-msgstr "Nazwa: "
+msgstr "Nazwa : "
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
-msgstr "Port: "
+msgstr "Port : "
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
-msgstr "�cie�ka CGI: "
+msgstr "�cie�ka CGI : "
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 msgid "Server Settings for Manual Search"
 msgstr "Ustawienia serwera dla r�cznego wyszukiwania"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 msgid "Local CD Data Base"
 msgstr "Lokalna baza danych CD"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 msgid "Path :"
-msgstr "�cie�ka: "
+msgstr "�cie�ka : "
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4149,58 +4249,57 @@ msgid ""
 "and 'misc'."
 msgstr ""
 "Okre�l katalog, w kt�rym znajduje si� lokalna baza CDDB. Lokalna baza danych "
-"CDDB zawiera 11 nast�puj�cych katalog�w: 'blues', 'classical', 'country', "
-"'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' oraz "
-"'misc'. "
+"CDDB zawiera 11 nast�puj�cych katalog�w: \"blues\", \"classical\", \"country"
+"\", \"data\", \"folk\", \"jazz\", \"newage\", \"reggae\", \"rock\", "
+"\"soundtrack\" oraz \"misc\"."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Ustawienia po�rednika (proxy)"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Korzystanie z po�rednika"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Uaktywnia ustawienia serwera po�rednicz�cego."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
-msgstr "Nazwa komputera: "
+msgstr "Nazwa komputera : "
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Nazwa serwera po�rednicz�cego."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Port serwera po�rednicz�cego."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
-msgstr "Nazwa u�ytkownika: "
+msgstr "Nazwa u�ytkownika : "
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "Nazwa u�ytkownika dla serwera po�rednicz�cego."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
-msgstr "Has�o u�ytkownika: "
+msgstr "Has�o u�ytkownika : "
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 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:1309
-#, fuzzy
+#: src/prefs.c:1342
 msgid "Track Name List"
-msgstr "Nazwa �cie�ki"
+msgstr "Lista �cie�ek"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4208,7 +4307,7 @@ msgstr ""
 "Zaznacz odpowiedni plik audio (odno�nie pozycji albo DLM, je�li aktywowane "
 "poni�ej)"
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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."
@@ -4217,7 +4316,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:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4228,15 +4327,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Potwierdzenia"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Potwierd� wyj�cie z programu"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4244,53 +4343,57 @@ msgstr ""
 "Je�li aktywne, wy�wietla okno dialogowe prosz�ce o potwierdzenie przed "
 "wyj�ciem z programu."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "Potwierd� zapisanie tag�w pliku"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "Potwierd� zmian� nazwy pliku"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "Potwierd� kasowanie pliku"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "Potwierd� zapisanie listy odtwarzania"
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Zastosuj zmiany (lecz nie zapisuj) i zamknij to okno"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "Zamknij to okno bez zapisywania zmian"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 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:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Przyk�ad: %.*d_-_Nazwa_�cie�ki_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "Zastosowano zmiany"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "Konfiguracja zapisana"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "Konfiguracja nie zmieniona"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4298,14 +4401,14 @@ msgid ""
 "(%s) "
 msgstr ""
 "�cie�ka wybrana jako \"Domy�lna �cie�ka do plik�w\" nie jest poprawna!\n"
-"'%s'\n"
+"\"%s\"\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "To nie jest katalog"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Nie mo�na znale�� programu \"%s\"!"
@@ -4322,16 +4425,16 @@ msgstr "Zmie� nazw� pliku"
 msgid "Process Fields"
 msgstr "Przetwarzaj pola"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "Znacznik pomy�lnie zeskanowany..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Znacznik pomy�lnie zeskanowany (%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4339,65 +4442,65 @@ msgstr ""
 "Skaner tag�w: dziwne..., rozszerzenie \"%s\" nie zosta�o znalezione w pliku "
 "\"%s\"!"
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, 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:660
+#: src/scan.c:663
 #, 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:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "Nowa nazwa pliku pomy�lnie zeskanowana..."
 
-#: src/scan.c:686
-#, fuzzy, c-format
+#: src/scan.c:689
+#, c-format
 msgid "New file name successfully scanned...(%s)"
-msgstr "Nowa nazwa pliku pomy�lnie zeskanowana...(%s)\n"
+msgstr "Nowa nazwa pliku pomy�lnie zeskanowana...(%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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "Skanowanie znacznik�w i nazw plik�w"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Skaner: "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "Wybierz rodzaj skanera, kt�ry ma zosta� u�yty"
 
 # TODO
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Wy�wietlenie okna skanera / skanowanie zaznaczonych plik�w"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Opcje skanera"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Wy�wietl / Ukryj edytor masek"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Wy�wietl / Ukryj legend�"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "Zamyka bie��ce okno"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4407,16 +4510,15 @@ msgstr ""
 
 # fixme
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "Podgl�d zmiany taga..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
-msgstr ""
+msgstr "Dodaj do maski przedrostek aktualnej �cie�ki"
 
-#: src/scan.c:1987
-#, fuzzy
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4424,18 +4526,21 @@ msgid ""
 "path, otherwise is relative to the old path."
 msgstr ""
 "Wybierz lub wprowad� mask� u�ywaj�c kod�w (zobacz Legend�) aby przetworzy� "
-"pola tag�w. U�ywane aby zmieni� nazw� pliku."
+"pola tag�w. U�ywane aby zmieni� nazw� pliku.\n"
+"U�yj / aby stworzy� katalogi. Je�li pierwszym znakiem jest /, oznacza on "
+"�cie�k� bezwzgl�dn�, w innych przypadkach �cie�ka traktowana jest jako "
+"wzgl�dna."
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "Podgl�d zmiany nazwy pliku..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Wybierz pola:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4444,130 +4549,126 @@ msgstr ""
 "przetworzone. Wybierz te, kt�re maj� by� zmienione."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "N"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "Przetwarzanie pola nazwa pliku"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "Przetwarzanie pola tytu�"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "Przetwarzanie pola artysta"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Przetwarzanie pola album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "R"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "Przetwarzanie pola rodzaj"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
-#, fuzzy
+#: src/scan.c:2166
 msgid "Cm"
-msgstr "K"
+msgstr "Km"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "Przetwarzanie pola komentarz"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
-#, fuzzy
+#: src/scan.c:2169
 msgid "Cp"
-msgstr "K"
+msgstr "Kp"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Przetwarzanie pola kompozytor"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
-msgstr ""
+msgstr "O"
 
-#: src/scan.c:2062
-#, fuzzy
+#: src/scan.c:2173
 msgid "Process original artist field"
-msgstr "Przetwarzanie pola artysta"
+msgstr "Przetwarzanie pola oryginalny artysta"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
-#, fuzzy
+#: src/scan.c:2175
 msgid "Cr"
-msgstr "K"
+msgstr "Cr"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Przetwarzanie pola prawa autorskie"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
-msgstr ""
+msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "Przetwarzanie pola URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
-msgstr ""
+msgstr "E"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "Przetwarzanie pola nazwa encodera"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Odwr�cenie zaznaczenia"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Wybierz/Odznacz wszystko."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Konwersja \"_\" i \"%20\" na \" \""
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Konwersja: "
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "na: "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4575,7 +4676,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:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4583,11 +4684,12 @@ 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:2171
-msgid "Replace a character by an other one."
-msgstr "Zmiana znaku na inny."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4595,7 +4697,7 @@ msgstr ""
 "Konwertuje wszystkie s�owa we wszystkich polach na wielkie litery. Przyk�ad, "
 "przed: \"Tekst W JAKIM� polu\", po: \"TEKST W JAKIM� POLU\"."
 
-#: src/scan.c:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4603,7 +4705,7 @@ msgstr ""
 "Konwertuje 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:2209
+#: src/scan.c:2325
 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'."
@@ -4612,7 +4714,7 @@ msgstr ""
 "liter�. Przyk�ad, przed: \"Tekst W Jakim� POLU\", po: \"Tekst w jakim� polu"
 "\"."
 
-#: src/scan.c:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4621,15 +4723,15 @@ msgstr ""
 "liter�. Przyk�ad, przed: \"Tekst w jakim� POLU\", po: \"Tekst W Jakim� Polu"
 "\"."
 
-#: src/scan.c:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Wstawia spacj� przed wielka liter�"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "Usuwa duplikaty spacji lub podkre�le�"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4637,7 +4739,7 @@ msgstr ""
 "Wszystkie spacje pomi�dzy s�owami s� usuwane. Przyk�ad, przed: \"Tekst W "
 "Jakim� Polu\", po: \"TekstWJakim�Polu\"."
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4645,7 +4747,7 @@ msgstr ""
 "Spacja jest wstawiana przed ka�d� wielk� liter�. Przyk�ad, przed: "
 "\"TekstWJakim�Polu\", po: \"Tekst W Jakim� Polu\"."
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4656,193 +4758,186 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a: artysta"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b: album"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c: komentarz"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p : kompozytor"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r: prawa autorskie    "
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d: numer dysku"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e: skompresowany przez    "
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g: gatunek"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i: ignorowane"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l: liczba �cie�ek"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o: oryg. artysta"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n: �cie�ka"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t: tytu�"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u: URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y: rok"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Edytor masek"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "Utw�rz now� mask�"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Przesu� mask� do g�ry"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Przesu� mask� w d�"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Zduplikuj mask�"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Dodaj domy�ln� mask�"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "Usu� mask�"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Zapisz maski"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "Nowa_maska"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "Kopiowanie: Nie wybrano wiersza!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "Usuwanie: Nie wybrano wiersza!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Przewijanie w g�r�: Nie wybrano wiersza!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Przewijanie w d�: Nie wybrano wiersza!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, 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:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Nie mo�na otworzy� pliku konfiguracji \"%s\" (%s)"
 
-#: src/setting.c:1019
-#, fuzzy
+#: src/setting.c:1033
 msgid "Loading default configuration..."
-msgstr "Wczytywanie domy�lnej konfiguracji...\n"
+msgstr "Wczytywanie domy�lnej konfiguracji..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Nie mo�na otworzy� lub utworzy� pliku \"%s\" (%s)"
 
-#: src/setting.c:1264
-#, fuzzy, c-format
+#: src/setting.c:1278
+#, 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:1344
-#, fuzzy
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
-msgstr "Wczytywanie domy�lnych masek \"Wype�nij tagi\"...\n"
+msgstr "Wczytywanie domy�lnych masek \"Wype�nij tagi\"..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
-#, fuzzy
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
-msgstr "Wczytywanie domy�lnych masek \"Zmie� nazw� pliku\"...\n"
+msgstr "Wczytywanie domy�lnych masek \"Zmie� nazw� pliku\"..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
-#, fuzzy
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
-msgstr "Wczytywanie domy�lnych masek \"Zmie� nazw� pliku\"...\n"
+msgstr "Wczytywanie domy�lnych masek \"Zmie� nazw� katalogu\"..."
 
-#: src/setting.c:1592
-#, fuzzy
+#: src/setting.c:1606
 msgid "ERROR: The environment variable HOME is not defined!"
-msgstr ""
-"B��D: Zmienna �rodowiskowa HOME nie jest zdefiniowana!\n"
-"\n"
+msgstr "B��D: Zmienna �rodowiskowa HOME nie jest zdefiniowana!"
 
-#: src/setting.c:1608
-#, fuzzy, c-format
+#: src/setting.c:1622
+#, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
-msgstr "B��D: Nie mo�na utworzy� katalogu \"%s\" (%s)\n"
+msgstr "B��D: Nie mo�na utworzy� katalogu \"%s\" (%s)!"
 
 #: src/vcedit.c:287
 msgid "Input truncated or empty."
@@ -4862,17 +4957,17 @@ msgstr "B��d odczytu pakietu pocz�tkowego nag��wka."
 
 # FIXME posiada/zawiera
 #: src/vcedit.c:341
-#, fuzzy
 msgid "Ogg bitstream contains neither speex or vorbis data."
-msgstr "Strumie� Ogg nie zawiera danych Vorbis(audio)."
+msgstr "Strumie� Ogg nie zawiera danych Vorbis(audio) ani Speex."
 
 #: src/vcedit.c:375
 msgid "Corrupt secondary header."
 msgstr "Uszkodzony zapasowy nag��wek."
 
 #: src/vcedit.c:405
+#, fuzzy
 msgid "Need to save extra headers - TODO!!"
-msgstr ""
+msgstr "Nale�y zapisa� dodatkowe nag��wki - DO ZROBIENIA!!"
 
 #: src/vcedit.c:419
 msgid "EOF before end of vorbis headers."
@@ -4916,7 +5011,7 @@ msgstr "Nie znaleziono funkcji \"%s\" w bibliotece DLL \"%s\""
 #: src/win32/win32dep.c:294
 #, fuzzy, c-format
 msgid "Audio player: '%s'"
-msgstr "Uruchom odtwarzacz audio"
+msgstr "Uruchom odtwarzacz audio: \"%s\""
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
@@ -4924,3 +5019,31 @@ msgstr "Uruchom odtwarzacz audio"
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr "Katalog ustawie� EasyTAG: \"%s\""
+
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Wprowadzona �cie�ka jest nieprawid�owa!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Rozr�nianie wielko�ci liter"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Zmiana znaku na inny."
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Zawarto�� wczytanego pliku : "
+
+#~ msgid "Files Name List :"
+#~ msgstr "Lista nazw plik�w : "
+
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(Wsparcie dla plik�w MP3 w��czone z u�yciem: libid3tag %s)"
+
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(Wsparcie tag�w ID3v2.3 w��czone z u�yciem: id3lib %d.%d.%d)"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 948ed8a..af3145d 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3f4c0fe..73227cd 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG-2.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2007-07-08 12:43-0300\n"
 "Last-Translator: doutor.zero <doutor.zero@gmail.com>\n"
 "Language-Team: Português do Brasil <pt@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Poedit-Country: BRAZIL\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
@@ -30,185 +30,229 @@ msgstr ""
 "MP3, MP2, FLAC, Ogg Vorbis, MP4/AAC, MusePack e Monkey's Audio. Sua simples "
 "e prática interface em GTK+ facilita a edição de etiquetas no GNU/Linux."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(Tradução alemã)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(Tradução russa)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(Tradução holandesa)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(Tradução sueca)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(Tradução húngara)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(Tradução italiana)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(Tradução japonesa)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(Tradução ucraniana)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(Tradução tcheca)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(Tradução espanhola)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(Tradução polonesa)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(Tradução romena)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(Tradução dinamarquesa)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(Tradução grega)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Tradução português do Brasil)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(Tradução búlgara)"
 
-#: src/about.c:160
+#: src/about.c:171
 msgid "(Chinese translation)"
 msgstr "(Tradução chinesa)"
 
-#: src/about.c:161
+#: src/about.c:172
 msgid "(Hebrew translation)"
 msgstr "(Tradução hebraica)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(Tradução alemã)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Comentário"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "Sobre..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "Sobre"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compilado: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(usando: GTK+ %d.%d.%d)"
 
-#: src/about.c:283
+#: src/about.c:305
 #, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(Suporte a arquivos MP3 habilitado usando: libid3tag %s)"
+msgid "Author: %s"
+msgstr "Autor: %s"
 
-#: src/about.c:287
+#: src/about.c:309 src/easytag.c:212
 #, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(Suporte a etiquetas ID3v2.3 habilitado usando: id3lib %d.%d.%d)"
+msgid "E-mail: %s"
+msgstr "E-mail: %s"
 
-#: src/about.c:292
-msgid "(ID3v2.3 tags  support disabled)"
-msgstr "(Suporte a etiquetas ID3v2.3 desabilitado)"
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Página na Web: "
+
+#: src/about.c:328
+msgid "Description:"
+msgstr "Descrição:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
 
-#: src/about.c:296
+#: src/about.c:390
 #, c-format
-msgid "(MP3 file support disabled)"
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
+#, fuzzy
+msgid "MP3 file support"
 msgstr "(Suporte a arquivos MP3 desabilitado)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
+#, c-format
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
+msgstr "(Suporte a etiquetas ID3v2.3 desabilitado)"
+
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "Sem memória disponível"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(Suporte a arquivos Ogg Vorbis desabilitado)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(Suporte a arquivos Speex desabilitado)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(Suporte a arquivos FLAC desabilitado)"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
 msgstr "(Suporte a arquivos MP4/AAC desabilitado)"
 
-#: src/about.c:322
-msgid "(WavPack file support disabled)"
+#: src/about.c:460
+#, fuzzy
+msgid "WavPack file support"
 msgstr "(Suporte a arquivos WavPack desabilitado)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "Autor: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-mail: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Página na Web: "
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "Descrição:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "Agradecimentos"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "Traduções:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "Principalmente:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "Modificações"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -541,7 +585,7 @@ msgstr "Renomear Diretório..."
 msgid "Reload Directory"
 msgstr "Recarregar Diretório"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "Navegar no Diretório com..."
 
@@ -686,7 +730,7 @@ msgstr "Selecionado novo caminho padrão para arquivos"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Confirme..."
 
@@ -698,86 +742,65 @@ msgstr ""
 "Alguns arquivos modificados não foram salvos...\n"
 "Você quer salvá-los antes de mudar de diretório?"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"O caminho escolhido é inválido!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "Erro..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 msgid "<All albums>"
 msgstr "<Todos os álbuns>"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, 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:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "Artista"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# Álbuns"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# Arquivos"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Álbum"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Ir para o diretório superior"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Escolha um diretório para navegar."
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Árvore"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "Artista & Álbum"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "Renomear o diretório"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Renomear o diretório '%s' para: "
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "Usar a máscara:"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 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:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -785,21 +808,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:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "Máscara de Verificação Inválida"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "Pré-visualização da renomeação do diretório..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Erro..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "Você deve digitar um nome para o diretório!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -828,7 +861,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -837,7 +870,7 @@ msgstr ""
 "Não foi possível renomear porque esse nome de diretório já existe!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -852,51 +885,51 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "Diretório Renomeado"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Programa para executar:"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 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:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "Abrir Arquivo com..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 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:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "Você deve digitar o nome do programa!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "O programa '%s' não foi encontrado!"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Não foi possível executar %s (erro %d)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "Não foi possível separar outro processo!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Comando executado: '%s %s'"
@@ -984,7 +1017,7 @@ msgstr "Buscar Em:"
 msgid "All Fields"
 msgstr "Todos os Campos"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Outro"
 
@@ -1059,7 +1092,7 @@ msgstr " Categorias "
 msgid "Results :"
 msgstr "Resultados:"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "Procurar:"
 
@@ -1089,7 +1122,7 @@ msgstr "Deselecionar todas as linhas"
 msgid "Invert lines selection"
 msgstr "Inverter linhas selecionadas"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "Selecionar todas as linhas"
 
@@ -1114,15 +1147,15 @@ msgstr "Definir Em:"
 msgid "All"
 msgstr "Todos"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "Nome do Arquivo"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "Título"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "Ano"
 
@@ -1134,12 +1167,12 @@ msgstr "Faixa #"
 msgid "# Tracks"
 msgstr "# Faixas"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "Gênero"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Executar a verificação atual para cada arquivo"
 
@@ -1151,7 +1184,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1172,87 +1205,87 @@ msgstr ""
 "Carrega as linhas selecionadas ou todas as linhas (se nenhuma linha estiver "
 "selecionada)."
 
-#: src/cddb.c:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Pronto para procurar..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, 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:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Organizar pelo Número da Faixa"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Organizar pelo Nome da Faixa"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Determinando host '%s'..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Não foi possível determinar o host '%s' (%s)!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, 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:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Conectando ao host '%s', porta '%d'..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Não foi possível conectar ao host '%s' (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Conectado ao host '%s'"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Recebendo dados (%s)..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Erro ao ler a resposta do cddb (%s)!"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Não foi possível criar o arquivo '%s' (%s)"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, 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);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "Enviando requisição..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Não foi possível enviar a requisição (%s)!"
@@ -1261,63 +1294,63 @@ msgstr "Não foi possível enviar a requisição (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "Recebendo dados..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 msgid "The server returned a wrong answer!"
 msgstr "O servidor retornou uma resposta incorreta!"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "O servidor retornou uma resposta incorreta! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 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:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Encontrado(s) %d álbum(ns) iguais"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Recebendo dados da página %d (álbum %d/%d)..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Recebendo dados da página %d..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr "Mais resultados para carregar..."
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 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:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d arquivo(s) selecionado(s)!"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 msgid "Local CD search..."
 msgstr "Busca de CD local..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
@@ -1326,27 +1359,27 @@ msgstr ""
 "Preencha-o na janela de preferências."
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, 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:3231
+#: src/cddb.c:3268
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Encontrados %d álbuns iguais para o DiscID '%s'"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, 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:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "Carregando lista das faixas do álbum..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1359,7 +1392,7 @@ msgstr ""
 "\n"
 "Deseja continuar?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "Gravar Etiqueta do CDDB..."
 
@@ -1633,11 +1666,11 @@ msgstr "Link de Arquivo Quebrado"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Camada ?"
 
@@ -1645,7 +1678,7 @@ msgstr "?, Camada ?"
 msgid "Bitrate:"
 msgstr "Taxa de Bits:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1653,17 +1686,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Freq:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Modo:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1846,13 +1879,13 @@ msgid "Tag selected files with these pictures"
 msgstr "Etiqueta os arquivos selecionados com essas imagens"
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
-msgstr "Remover as imagens selecionadas, ou todas as imagens."
-
-#: src/easytag.c:1051
 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:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "Remover as imagens selecionadas, ou todas as imagens."
+
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "Salvar as imagens selecionadas no disco rígido."
@@ -2224,7 +2257,7 @@ msgstr "Apagar Arquivo..."
 msgid "File '%s' deleted"
 msgstr "Arquivo '%s' apagado"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2236,109 +2269,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "Busca em progresso..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "Arquivo: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, 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:3235
+#: src/easytag.c:3239
 #, 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:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u arquivo(s)"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr "Nenhum arquivo encontrado nesse diretório e subdiretórios!"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "Nenhum arquivo encontrado nesse diretório!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Procurando..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "  PARAR a busca...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "Selecione um diretório para navegar!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "Etiquetar arquivos selecionados com esse campo"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Converter '_' e '%20' para espaços"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "Converter ' ' para '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "Todas maiúsculas"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "Todas minúsculas"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "Primeira letra maiúscula"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "Primeira letra de cada palavra maiúscula"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "Remover espaços"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Inserir espaço antes da letra maiúscula"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 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:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Saída anormal! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, c-format
-msgid "Received signal %s (%d)"
-msgstr "Recebido o sinal %s (%d)"
+msgid "Received signal %s (%d)\a"
+msgstr "Recebido o sinal %s (%d)\a"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2348,11 +2381,12 @@ msgstr ""
 "bug com um backtrace do gdb ('gdb easytag core' então 'bt' e 'l') e "
 "informações para reproduzi-lo para easytag@gmail.com"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Sinal desconhecido"
 
-#: src/easytag.c:4466
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2365,8 +2399,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2386,11 +2419,11 @@ msgstr ""
 "caminho_para/arquivos     Usar um caminho relativo.\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Saída normal."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2398,7 +2431,7 @@ msgstr ""
 "Alguns arquivos modificados não foram salvos...\n"
 "Você deseja salvá-los antes de fechar o programa?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr " Tem certeza que deseja fechar o programa? "
 
@@ -2494,7 +2527,7 @@ 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:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "Tradução do nome do arquivo"
 
@@ -2665,122 +2698,122 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "Arquivo corrompido..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr "Log"
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " OK "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " Sim "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " Não "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " Aplicar "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " Salvar "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " Cancelar "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " Fechar "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " Gravar "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " Executar "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr " Procurar "
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr " Navegar... "
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "Diretório selecionado..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "Arquivo selecionado..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "Warning..."
 msgstr "Atenção..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr "Nenhum reprodutor de áudio definido!"
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, 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:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "Gerar uma lista de músicas"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "Nome da Lista de músicas M3U"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "Usar o nome do diretório"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Editar Máscaras"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "Opções da Lista de músicas"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Incluir somente os arquivos selecionados"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2788,29 +2821,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:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "Usar o caminho absoluto para os arquivos na lista de músicas"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 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:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "Criar uma lista de músicas no diretório acima"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 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:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "Usar separador de diretório DOS"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2818,23 +2851,23 @@ msgstr ""
 "Essa opção substitui o separador de diretório UNIX '/' por um separador DOS "
 "'\\'."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "Conteúdo da Lista de músicas"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "Gravar somente a lista dos arquivos"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "Gravar informações usando o nome do arquivo"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Gravar informações usando:"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2843,12 +2876,12 @@ msgstr ""
 "O arquivo de lista de músicas '%s' já existe!\n"
 "Sobrescrever?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "Gravar Lista de músicas..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2857,48 +2890,44 @@ msgstr ""
 "Não foi possível gravar o arquivo de lista de músicas '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Gravando o arquivo de lista de músicas '%s'"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "Faixa"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Comentário"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "Artista Orig."
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "URL"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "Codificador por"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "Procurar um arquivo"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2906,54 +2935,93 @@ msgstr ""
 "exibir todos os arquivos."
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "No:"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "Etiqueta"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Sensível à capitalização"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Encontrado: %d arquivo(s)"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "Carregar os nomes dos arquivos de um arquivo TXT"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 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:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " Carregar "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "Conteúdo do Arquivo Carregado:"
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "Confirmar a renomeação do arquivo"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "Insere um espaço antes de uma letra maiúscula"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Apagar essa linha"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+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:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "Incluir somente os arquivos selecionados"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "Incluir somente os arquivos selecionados"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Recarregar"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Gravar somente a lista dos arquivos"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "Lista dos Nomes de Arquivos:"
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Selecionar todas as linhas"
 
-#: src/misc.c:2828
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2962,21 +3030,23 @@ msgstr ""
 "selecionado atualmente será executado (a janela do verificador deverá estar "
 "aberta)."
 
-#: src/misc.c:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "Inserir uma linha em branco"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "Apagar essa linha"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "Apagar todas as linhas em branco"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Mover essa Máscara para Cima"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "Recarregar"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Mover essa Máscara para Baixo"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3115,111 +3185,111 @@ msgstr ""
 msgid "Save file..."
 msgstr "Salvar arquivo..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "Imagem JPEG"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "Imagem PNG"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "Imagem desconhecida"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 pixels: ícone de arquivo PNG"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "Outro ícone de arquivo"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "Capa (frente)"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "Capa (atrás)"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "Página do folheto"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "Media (ex. etiqueta lateral do CD)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "Artista principal/músico principal/solista"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "Artista/músico"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "Maestro"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "Banda/Orquestra"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "Letrista/escritor"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "Local da gravação"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "Duração da gravação"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "Duração da performance"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "Captura de tela de filme/vídeo"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "Um peixe de cores fortes"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "Ilustração"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "Logotipo da banda/artista"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "Logotipo do distribuidor/estúdio"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "Tipo de imagem desconhecida"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "pixels"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "Tipo"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "Descrição"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3227,11 +3297,11 @@ msgstr ""
 "Não foi possível exibir a imagem, porque não foram lidos dados suficientes "
 "para determinar como o buffer de imagem deve ser criado."
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "Carregando Arquivo de Imagem..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3242,7 +3312,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "O arquivo de imagem não foi carregado..."
 
@@ -3498,24 +3568,51 @@ msgstr ""
 "podem ser passados para o programa (como 'xmms -p') antes que ele receba os "
 "arquivos e outros argumentos."
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Opções das Etiquetas"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "Centro da janela principal"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr "Se ativada, a lista de músicas será criada no diretório acima."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "Configurações do Arquivo"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "Opções de Arquivo"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr ""
 "Substituir caracteres ilegais no nome do arquivo (para Windows e CD-ROM)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3528,40 +3625,40 @@ msgstr ""
 "verificador, a partir da etiqueta."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "Converter a extensão do arquivo para:"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "Minúscula"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "Por exemplo, a extensão será convertida para '.mp3'"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "Maiúscula"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "Por exemplo, a extensão será convertida para '.MP3'"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "Sem alteração"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "A extensão não será convertida"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "Preservar a data de modificação do arquivo"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
@@ -3569,13 +3666,13 @@ msgstr ""
 "arquivo."
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3586,12 +3683,12 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr "Conjunto de Caracteres para o Nome do Arquivo"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
@@ -3599,11 +3696,11 @@ msgstr ""
 "Quando não for possível converter caracteres para a codificação de "
 "caracteres do sistema ao gravar o arquivo:"
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "Tentar outra codificação de caracteres"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
@@ -3614,14 +3711,14 @@ msgstr ""
 "para 'ro'). Se isso falhar, será usada a codificação de caracteres ISO-8859-"
 "1."
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 "Forçar o uso da codificação de caracteres do sistema e ativar a "
 "transliteração"
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3631,7 +3728,7 @@ msgstr ""
 "de caracteres alvo, ele será aproximado através de um ou vários caracteres "
 "parecidos."
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
@@ -3639,7 +3736,7 @@ msgstr ""
 "Forçar o uso da codificação de caracteres do sistema e descartar "
 "silenciosamente alguns caracteres"
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3650,20 +3747,20 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "Ajustes das Etiquetas"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "Opções das Etiquetas"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "Auto-completar se a data não estiver completa"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3673,11 +3770,11 @@ msgstr ""
 "data (por exemplo, se o ano atual for 2005: 5 => 2005, 4 => 2004, 6 => 2006, "
 "95 => 1995, ...)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "Gravar o campo da faixa com o seguinte número de dígitos:"
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3687,11 +3784,11 @@ msgstr ""
 "de obter um número com 'n' dígitos (ex. com dois dígitos: '05', '09', "
 "'10', ...). Caso contrário será mantido o valor 'bruto' da faixa."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Arquivos Ogg Vorbis: gravar também o comentário para o formato XMMS"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3706,7 +3803,7 @@ msgstr ""
 "reclamem sobre um campo desconhecido. Apesar de que isso fará com que os "
 "comentários não sejam mostrados no XMMS."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
@@ -3714,11 +3811,11 @@ msgstr ""
 "Focalizar o campo da etiqueta ao mudar de arquivos na lista com os atalhos "
 "Page Up/Page Down:"
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr "Manter o foco no mesmo campo da etiqueta"
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr "Retornar o foco ao primeiro campo da etiqueta (ie. campo 'Título')"
 
@@ -3726,21 +3823,21 @@ msgstr "Retornar o foco ao primeiro campo da etiqueta (ie. campo 'Título')"
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "Configurações da Etiqueta ID3"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "Regras para Etiquetas MP3"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "Gravar etiquetas ID3 em arquivos FLAC (além da etiqueta FLAC)"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3750,11 +3847,11 @@ msgstr ""
 "etiquetas ID3 serão removidas."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "Remover etiquetas se todos os campos estiverem em branco"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3767,11 +3864,11 @@ msgstr ""
 "dados estiverem em branco."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Converter automaticamente versões antigas de etiquetas ID3v2"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3780,39 +3877,39 @@ msgstr ""
 "versão ID3v2.3."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr "Usar CRC32"
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "Aplicar o CRC32 nas etiquetas ID3v2"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr "Usar Compressão"
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr "Aplicar a Compressão nas etiquetas ID3v2 "
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 msgid "Character Set for writing ID3 tags"
 msgstr "Conjunto de Caracteres para a gravação das etiquetas ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 msgid "ID3v2 tags"
 msgstr "Etiquetas ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "Gravar etiqueta ID3v2.x"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -3821,11 +3918,11 @@ msgstr ""
 "arquivos MP3. Caso contrário a etiqueta será removida."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 msgid "Version:"
 msgstr "Versão:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3837,53 +3934,53 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr "Conjunto de caracteres:"
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 msgid "Unicode "
 msgstr "Unicode "
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 msgid "Unicode type to use"
 msgstr "Tipo do unicode a ser usado"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 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:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr "Configurações adicionais para o iconv():"
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 msgid "No"
 msgstr "Não"
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr "//TRANSLITERAR"
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr "//IGNORAR"
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 msgid "ID3v1 tags"
 msgstr "Etiquetas ID3v1"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "Gravar etiqueta ID3v1.x"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3891,22 +3988,22 @@ 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:846
+#: src/prefs.c:878
 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:878
+#: src/prefs.c:910
 msgid "Character Set for reading ID3 tags"
 msgstr "Conjunto de Caracteres para a leitura das etiquetas ID3"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr "Fora do padrão:"
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3937,31 +4034,31 @@ msgstr ""
 "caracteres 'Windows-1251' para carregar etiquetas gravadas no Windows. E "
 "'KOI8-R' para carregar etiquetas gravadas em sistemas Unix."
 
-#: src/prefs.c:914
+#: src/prefs.c:947
 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:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Verificador"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Verificador de Preenchimento da Etiqueta - Conversão de Caracteres"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Converter caractere underscore '_' e a seqüencia '%20' para espaço ' '"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Converter espaço ' ' para underscore '_'"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -3970,11 +4067,11 @@ msgstr ""
 "etiquetas."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Verificador de Renomeamento de Arquivos - Conversão de Caracteres"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -3983,19 +4080,19 @@ msgstr ""
 "nome dos arquivos."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 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:1001
+#: src/prefs.c:1034
 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:1005
+#: src/prefs.c:1038
 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 "
@@ -4008,15 +4105,15 @@ msgstr ""
 "de 'Texto Em Uma Entrada')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Janela do Verificador"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Abrir a Janela do Verificador na inicialização"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4024,11 +4121,11 @@ msgstr ""
 "Ative essa opção para abrir automaticamente a janela do verificador quando o "
 "EasyTAG iniciar."
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Janela do verificador sempre no topo"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4037,16 +4134,16 @@ msgstr ""
 "principal."
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "Campos"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Sobrescrever campos ao verificar as etiquetas"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4055,11 +4152,11 @@ msgstr ""
 "novo. Se desativado, somente os campos em branco da etiqueta serão "
 "preenchidos."
 
-#: src/prefs.c:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "Definir esse texto como o comentário padrão:"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4068,13 +4165,13 @@ msgstr ""
 "comentário ao usar o 'Verificador de Preenchimento'."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 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:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4085,42 +4182,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "Banco de Dados de CDs"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 msgid "Server Settings for Automatic Search"
 msgstr "Configurações do Servidor para Busca Automática"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "Nome:"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "Porta:"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "Caminho CGI:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 msgid "Server Settings for Manual Search"
 msgstr "Configurações do Servidor para Busca Manual"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 msgid "Local CD Data Base"
 msgstr "Banco de Dados de CDs Local"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 msgid "Path :"
 msgstr "Caminho:"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4133,52 +4230,52 @@ msgstr ""
 "'soundtrack' e 'misc'.\""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Opções Proxy"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Usar um proxy"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Definir as opções ativas do servidor proxy."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "Nome do Host:"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Nome do servidor proxy."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Porta do servidor proxy."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "Nome do Usuário:"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "Nome do usuário do servidor proxy."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "Senha do Usuário:"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 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:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "Lista do Nome das Faixas"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4186,7 +4283,7 @@ msgstr ""
 "Selecionar o arquivo de áudio correspondente (de acordo com a posição ou com "
 "o DLM, se ativado abaixo)"
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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."
@@ -4195,7 +4292,7 @@ msgstr ""
 "correspondente na lista principal também será selecionado."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4206,15 +4303,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Confirmar ao sair do programa"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4222,53 +4319,57 @@ msgstr ""
 "Se ativada, será aberta uma caixa de diálogo pedindo confirmação antes de "
 "fechar o programa."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "Confirmar a gravação da etiqueta no arquivo"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "Confirmar a renomeação do arquivo"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "Confirmar a remoção do arquivo"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "Confirmar a gravação da lista de músicas"
 
-#: src/prefs.c:1389
+#. 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:1422
 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:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "Fechar essa janela sem salvar"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 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:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Exemplo: %.*d_-_Nome_da_faixa_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "Modificações aplicadas"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "Configuração salva"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "Configuração inalterada"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4279,11 +4380,11 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "Não é um diretório"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "O reprodutor de áudio '%s' não foi encontrado!"
@@ -4300,16 +4401,16 @@ msgstr "Renomear Arquivo e Diretório"
 msgid "Process Fields"
 msgstr "Processar Campos"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "Etiqueta verificada com sucesso..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Etiqueta verificada com sucesso...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4317,24 +4418,24 @@ msgstr ""
 "Verificador de etiqueta: estranho..., a extensão '%s' não foi encontrada no "
 "nome de arquivo '%s'!"
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, 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:660
+#: src/scan.c:663
 #, 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:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "Novo nome do arquivo verificado com sucesso..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Novo nome do arquivo verificado com sucesso...(%s)"
@@ -4342,41 +4443,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "Verificação da Etiqueta e do Nome do Arquivo"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Verificador:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "Selecionar o tipo do verificador"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Abrir janela do verificador / Verificar arquivos selecionados"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Opções do Verificador"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Mostrar / Esconder o Editor de Máscaras"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Mostrar / Esconder Legendas"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "Fechar essa janela"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4385,15 +4486,15 @@ msgstr ""
 "o nome do arquivo e o caminho. Usado para preencher campos das etiquetas."
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "Pré-visualização do preenchimento da etiqueta..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr "Prefixo da máscara no caminho atual"
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4406,15 +4507,15 @@ msgstr ""
 "contrário é relativo ao caminho anterior."
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "Pré-visualização da renomeação do arquivo..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Campos selecionados:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4423,126 +4524,126 @@ msgstr ""
 "Selecione os que lhe interessam."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "A"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 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:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "Processar o campo do título"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "Processar o campo do artista"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Processar o campo do álbum"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "Processar o campo do gênero"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "Processar o campo do comentário"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Processar o campo do compositor"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "A"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 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:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Processar o campo de copyright"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "Processar o campo da URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "C"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "Processar o campo do nome do codificador"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Inverter Seleção"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Selecionar/Deselecionar Todos."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Converter '_' e '%20' para ' '"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Converter:"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "para: "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4551,7 +4652,7 @@ msgstr ""
 "Por exemplo, antes: 'Texto%20Em%20Uma_Entrada', depois: 'Texto Em Uma "
 "Entrada'."
 
-#: src/scan.c:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4559,11 +4660,12 @@ 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:2171
-msgid "Replace a character by an other one."
-msgstr "Substituir um caractere por outro."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4571,7 +4673,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:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4579,7 +4681,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:2209
+#: src/scan.c:2325
 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'."
@@ -4588,7 +4690,7 @@ msgstr ""
 "campos). Por exemplo, antes: 'Texto EM Uma ENTRADA', depois: 'Texto em uma "
 "entrada'."
 
-#: src/scan.c:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4597,15 +4699,15 @@ msgstr ""
 "campos). Por exemplo, antes: 'Texto em uma ENTRADA', depois: 'Texto Em Uma "
 "Entrada'."
 
-#: src/scan.c:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Insere um espaço antes de uma letra maiúscula"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "Remove espaços ou underscores duplicados"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4613,7 +4715,7 @@ msgstr ""
 "Todos os espaços entre palavras são removidos. Por exemplo, antes: 'Texto Em "
 "Uma Entrada', depois: 'TextoEmUmaEntrada'."
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4621,7 +4723,7 @@ msgstr ""
 "Um espaço é inserido antes de cada letra maiúscula. Por exemplo, antes: "
 "'TextoEmUmaEntrada', depois: 'Texto Em Uma Entrada'."
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4632,183 +4734,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a: artista"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b: álbum"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c: comentário"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p: compositor"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r: copyright"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d: número do disco"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e: codificado por"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g: gênero"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i: ignorado"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l: número de faixas"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o: artista orig."
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n: faixa"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t: título"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u: URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y: ano"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Editor de Máscara"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "Criar Nova Máscara"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Mover essa Máscara para Cima"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Mover essa Máscara para Baixo"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Duplicar Máscara"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Adicionar Máscaras Padrão"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "Remover Máscara"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Salvar Máscaras"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "Nova_máscara"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "Copiar: Nenhuma coluna selecionada!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "Remover: Nenhuma coluna selecionada!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Mover para Cima: Nenhuma coluna selecionada!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Mover para Baixo: Nenhuma coluna selecionada!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, 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:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, 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:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "Carregando configuração padrão..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, 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:1264
+#: src/setting.c:1278
 #, 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:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Carregando as máscaras padrão de 'Preenchimento de Etiqueta..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "Carregando as máscaras padrão de 'Renomear Arquivo'..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Carregando as máscaras padrão de 'Renomear Diretório'..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ERRO: A variável de ambiente HOME não está definida!"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ERRO: Não foi possível criar o diretório '%s' (%s)!"
@@ -4893,6 +4995,34 @@ msgstr "Reprodutor de áudio: '%s'"
 msgid "EasyTAG settings dir: '%s'"
 msgstr "Diretório de configurações do EasyTAG: '%s'"
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "O caminho escolhido é inválido!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Sensível à capitalização"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Substituir um caractere por outro."
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Conteúdo do Arquivo Carregado:"
+
+#~ msgid "Files Name List :"
+#~ msgstr "Lista dos Nomes de Arquivos:"
+
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(Suporte a arquivos MP3 habilitado usando: libid3tag %s)"
+
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(Suporte a etiquetas ID3v2.3 habilitado usando: id3lib %d.%d.%d)"
+
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "Versão da etiqueta ID3v2"
 
@@ -5034,8 +5164,8 @@ msgstr "Diretório de configurações do EasyTAG: '%s'"
 #~ "O tradução do conjunto de caracteres '%s'\n"
 #~ "para '%s' não é suportado!"
 
-#~ msgid "ERROR while opening file: '%s' (%s)"
-#~ msgstr "ERRO ao abrir o arquivo: '%s' (%s)"
+#~ msgid "ERROR while opening file: '%s' (%s)\a"
+#~ msgstr "ERRO ao abrir o arquivo: '%s' (%s)\a"
 
 #~ msgid "Load on startup the directory"
 #~ msgstr "Carregar na inicialização o diretório"
diff --git a/po/ro.gmo b/po/ro.gmo
index 555b463..c0f13fb 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index 4ac1364..862553a 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 1.99.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2005-04-19 10:07+0200\n"
 "Last-Translator: Pauliuc George <romania@users.sourceforge.net>\n"
 "Language-Team: Romanian <pauliuc@gmx.net>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Poedit-Country: ROMANIA\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 
-#: src/about.c:122
+#: src/about.c:134
 #, fuzzy
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
@@ -28,193 +28,234 @@ msgstr ""
 "etichtelor fisierelor MP3, MP2, FLAC, Ogg Vorbis, MusePack si Monkey Audio. "
 "Interfata sa simpla (GTK+) face etichetarea mai simpla."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(Traducerea germana)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(Traducerea rus�)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(Traducerea olandez�)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(Traducerea suedez�)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(Traducerea ungar�)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(Traducerea italian�)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(Traducerea japonez�)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(Traducerea ucrainian�)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(Traducerea ceh�)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(Traducerea spaniol�)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(Traducerea polonez�)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(Traducerea rom�n�)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(Traducerea daneza)"
 
-#: src/about.c:157
+#: src/about.c:168
 #, fuzzy
 msgid "(Greek translation)"
 msgstr "(Traducerea germana)"
 
-#: src/about.c:158
+#: src/about.c:169
 #, fuzzy
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Traducerea japonez�)"
 
-#: src/about.c:159
+#: src/about.c:170
 #, fuzzy
 msgid "(Bulgarian translation)"
 msgstr "(Traducerea ungar�)"
 
-#: src/about.c:160
+#: src/about.c:171
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(Traducerea japonez�)"
 
-#: src/about.c:161
+#: src/about.c:172
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(Traducerea germana)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(Traducerea germana)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Comentariu"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "Despre..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "Despre"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compilat: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(folosind: GTK+ %d.%d.%d si id3lib %d.%d.%d)"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(Suportul pentru FLAC dezactivat)"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "Autor: %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(Suportul pentru FLAC dezactivat)"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "E-mail: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Pagin� de web: "
 
-#: src/about.c:292
+#: src/about.c:328
+msgid "Description:"
+msgstr "Descriere:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:296
-#, fuzzy, c-format
-msgid "(MP3 file support disabled)"
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
+#, c-format
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "Nu este destul� memorie"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(Suportul pentru Ogg Vorbis dezactivat)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:317
+#: src/about.c:450
 #, fuzzy
-msgid "(MP4/AAC file support disabled)"
+msgid "MP4/AAC file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:322
+#: src/about.c:460
 #, fuzzy
-msgid "(WavPack file support disabled)"
+msgid "WavPack file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "Autor: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-mail: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Pagin� de web: "
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "Descriere:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "Mul�umiri"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "Traduceri:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "General:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "Schimbari"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -549,7 +590,7 @@ msgstr "Redenumeste directorul..."
 msgid "Reload Directory"
 msgstr "Re�ncarc� directorul"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "Navigheaz� directorul cu ..."
 
@@ -695,7 +736,7 @@ msgstr "Nou� cale implicit� pentru fi�ierele alese"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Confirm�ri..."
 
@@ -707,88 +748,67 @@ 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:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"Calea introdus� nu este valid�!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "Eroare..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 #, fuzzy
 msgid "<All albums>"
 msgstr "# Albume"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, 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:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "Artist"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# Albume"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# Fisiere"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Mergi �n directorul parinte"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Introduce�i un director de navigat."
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Arbore"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "Artist si Album"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "Redenume�te directorul"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Redenume�te directorul '%s' : "
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "Foloseste masca:"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 #, 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:3236
+#: src/browser.c:3263
 #, fuzzy
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
@@ -798,22 +818,32 @@ msgstr ""
 "examina numele de fi�iere �i calea. Folosit pentru a completa c�mpurile "
 "etichetei."
 
-#: src/browser.c:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "Mask de examinare invalid"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 #, fuzzy
 msgid "Rename directory preview..."
 msgstr "Previziualizeaz� redenumirea fi�ierului"
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Eroare..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "Trebuie s� introduce�i un nume de director!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, 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."
@@ -840,7 +870,7 @@ msgstr "Nu pot converti '%s' in codarea fisierului. Alegeti alt nume."
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -849,7 +879,7 @@ msgstr ""
 "Nu pot redenumi pentru c� acest nume de director exist� deja!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -864,50 +894,50 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "Director redenumit"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Program de executat :"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 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:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "Deschide fisierul cu ..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 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:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "Trebuie s� introduce�i un nume de fi�ier!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, fuzzy, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Nu pot executa %s (%s)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "Nu pot porni (fork) alt proces!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Comanda executat� : '%s %s'"
@@ -996,7 +1026,7 @@ msgstr "Caut� �n :"
 msgid "All Fields"
 msgstr "Toate c�mpurile"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Altele"
 
@@ -1071,7 +1101,7 @@ msgstr " Categorii "
 msgid "Results :"
 msgstr "Rezultate :"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "C�utare :"
 
@@ -1100,7 +1130,7 @@ msgstr "Deselecteaza toate liniile"
 msgid "Invert lines selection"
 msgstr "Inverseaza alegerea liniilor"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "Alege toate liniile"
 
@@ -1126,15 +1156,15 @@ msgstr "Fixeaz� �n :"
 msgid "All"
 msgstr "Toate"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "Numele fi�ierlui"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "Titlu"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "An"
 
@@ -1146,12 +1176,12 @@ msgstr "Pist� #"
 msgid "# Tracks"
 msgstr "# Piste"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "Gen"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Ruleaza examinatorul curent pentru fiecare fisier"
 
@@ -1163,7 +1193,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1177,86 +1207,86 @@ 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:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Gata s� caut..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, 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:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Inverseaza alegerea"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Ordoneaza lista crescator dupa numar"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Ordoneaza dupa numele pistei"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Rezolv gazda '%s'..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Nu pot rezolva gazda '%s' (%s)!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, 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:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "M� conectez la gazda '%s', port '%d' ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Nu m� pot conecta la gazda '%s' (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Conectat la gazda '%s'"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Primesc datele (%s) ..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, 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:1765
+#: src/cddb.c:1770
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Nu pot crea sau deschide '%s' (%s)"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Nu pot deschide '%s' (%s)"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "Trimit cerere ..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Nu pot trimite cerere (%s)!"
@@ -1265,91 +1295,91 @@ msgstr "Nu pot trimite cerere (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "Primesc datele ..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "Serverul a intors un raspuns gresit! (%s)"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Serverul a intors un raspuns gresit! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Regret, cautarea web este inaccesibila"
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Am g�sit %d album(e)"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Primesc datele (%s) ..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Primesc datele (%s) ..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d fisier(e) alese!"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Gata s� caut..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, 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:3231
+#: src/cddb.c:3268
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Am g�sit %d album(e)"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, 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:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "�ncarc lista de piste a albumului"
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1362,7 +1392,7 @@ msgstr ""
 "\n"
 "Continuati?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "Scrie eticheta din CDDB..."
 
@@ -1634,11 +1664,11 @@ msgstr "Leg�tur� fi�ier incorect�"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Strat ?"
 
@@ -1646,7 +1676,7 @@ msgstr "?, Strat ?"
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1654,17 +1684,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Frecven��:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mod:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1847,13 +1877,13 @@ msgid "Tag selected files with these pictures"
 msgstr "Eticheteaza fisierele alese cu aceste imagini"
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
-msgstr "Sterge imaginile alese sau toate imaginile."
-
-#: src/easytag.c:1051
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Adauga imagini etichetei ('drag and drop' este disponibil)."
 
+#: src/easytag.c:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "Sterge imaginile alese sau toate imaginile."
+
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "Salveaza imaginile alese pe hard disc"
@@ -2229,7 +2259,7 @@ msgstr "�terge fi�ierul..."
 msgid "File '%s' deleted"
 msgstr "Fisierul '%s' a fost sters"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2241,109 +2271,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "C�utare �n curs..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "Fi�ier: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, 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:3235
+#: src/easytag.c:3239
 #, 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:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u fisier(e)"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 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:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "Nici un fi�ier nu a fost g�sit �n acest director!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Caut..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "  Opre�te c�utarea...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "Alege�i un director de navigat!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "Eticheteaza fisierele alese cu titlul acesta"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Schimb� '_' �i '%20' �n spa�ii"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "Schimb� ' ' �n '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "Toate majuscule"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "Toate minuscule"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "Prima liter� majuscul�"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "Prima liter� a fiec�rui cuv�nt majuscul�"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "�terge spa�iile"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Introdu spa�iu �nainte de majuscul�"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 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:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Ie�ire anormal�! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, fuzzy, c-format
-msgid "Received signal %s (%d)"
+msgid "Received signal %s (%d)\a"
 msgstr "Primit semnalul %s (%d)\n"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 #, fuzzy
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
@@ -2353,12 +2383,12 @@ msgstr ""
 "Probabil ati gasit o problema cu EasyTAG. Va rog sa trimiteti un raport cu "
 "gdb backtrace ('gdb easytag core' apoi 'bt') la easytag@gmail.com\n"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Semnal necunoscut"
 
-#: src/easytag.c:4466
-#, fuzzy
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2371,8 +2401,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2390,11 +2419,11 @@ msgstr ""
 "/calea_spre/fisiere   Folositi o cale absoluta pentru a �ncarca\n"
 "., ./                 �ncarca directorul curent\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Ie�ire normal�."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2402,7 +2431,7 @@ msgstr ""
 "Unele fi�iere au fost modificate dar nu �i salvate...\n"
 "Dori�i s� le salvez �nainte de ie�ire?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr " Sigur vre�i s� ie�iti din program? "
 
@@ -2501,7 +2530,7 @@ msgstr ""
 "in codarea sistemului de fisiere\n"
 "(Incercati sa modificati variabila de mediu G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "Optiuni ale conversiei numelui de fisier"
 
@@ -2535,7 +2564,7 @@ msgstr "Schimbari"
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "Eroare �n timpul deschiderii fisierului: '%s' (%s).\n"
-""
+"\a"
 
 #: src/flac_tag.c:983 src/ogg_tag.c:752
 #, c-format
@@ -2664,123 +2693,123 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "Salvati fisierul..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " OK "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " Da "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " Nu "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " Aplica "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " Salveaz� "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " Anuleaz� "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " �nchide "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " Scrie "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " Execut� "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr " Caut� "
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr " Navigheaz�... "
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "Alege�i directorul..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "Alege�i fi�ierul..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 #, fuzzy
 msgid "Warning..."
 msgstr "Caut..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, 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:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "Genereaz� un playlist"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "Numele M3U playlist"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "Folose�te numele de director"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Modific� mask"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "Op�iuni playlist"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Include doar fisierele alese"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2788,29 +2817,29 @@ msgstr ""
 "Daca se activeaza doar fisierele alese vor fi scrise in \"playlist\". Altfel "
 "toate vor fi scrise."
 
-#: src/misc.c:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "Folose�te calea complet� pentru fi�ierele din playlist"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 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:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "Creaza playlist in directorul parinte"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 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:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "Foloseste separatorul de directoare din DOS"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2818,23 +2847,23 @@ msgstr ""
 "Aceasta optiune schimba separatorul de directoare UNIX '/' in separatorul "
 "DOS '\\'."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "Con�inutul playlist"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "List� de fi�iere disponibile doar pentru scriere"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "Scrie informa�iile folosind numele de fi�ier"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Scrie informa�iile folosind :"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2843,12 +2872,12 @@ msgstr ""
 "Fi�ierul playlist '%s' exist� deja!\n"
 "Suprascriu?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "Scriu playlist..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2857,48 +2886,44 @@ msgstr ""
 "Nu pot scrie fi�ierul playlist '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Am scris fi�ierul playlist '%s'"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "Pist�"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Comentariu"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "Compozitor"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "Artist initial"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Drept de autor"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "URL"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "Codor"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "Caut� un fi�ier"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2906,56 +2931,95 @@ msgstr ""
 "afisa toate fisierele."
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "�n :"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 #, 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:1987
+#: src/misc.c:2033
 #, fuzzy
 msgid "the Tag"
 msgstr "Scriu eticheta..."
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Cu majuscule seminifcative"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Gasit : %d fi�ier(e)"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "�ncarc� numele de fi�ier dintr-un fi�ier TXT"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 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:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " �ncarc� "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "Con�inutul fi�ierului �ncarcat :"
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "Confirm� redenumirea fi�ierului"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "Lista numelor de fi�iere :"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "Introdu un spa�iu �nainte de o majuscul�"
 
-#: src/misc.c:2828
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "�terge aceast� linie"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "�terge toate liniile goale"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, 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:2870 src/misc.c:2964
+#, 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:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Re�ncarc�"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "List� de fi�iere disponibile doar pentru scriere"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Alege toate liniile"
+
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2964,21 +3028,23 @@ msgstr ""
 "examinatorul curent va fi rulat (fereastra examinatorului trebuie sa fie "
 "deschisa)."
 
-#: src/misc.c:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "Introdu o linie goal�"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "�terge aceast� linie"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "�terge toate liniile goale"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Mut� sus aceast� masc�"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "Re�ncarc�"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Mut� jos aceast� masc�"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3114,121 +3180,121 @@ msgstr ""
 msgid "Save file..."
 msgstr "Salvati fisierul..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "Imagine JPEG"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "Imagine PNG"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "Imagine necunoscuta"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "Icon PNG de 32x32 pixeli"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "Alt icon"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "Coperta (fata)"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "Coperta (spate)"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "Pagina brosura"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "Media (ex. cotorul CD)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "Artistul de baza/solo"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "Artist/interpret"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "Dirijor"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "Formatie/Orchestra"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "Versuri/textier"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "Locul inregistrarii"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "In timpul inregistrarii"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "In timpul spectacolului"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "Captura de ecran"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "Un peste colorat intens"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "Ilustratie"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "Emblema formatie/artist"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "Emblema distribuitor/studio"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "Tip de imagine necunoscut"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "pixeli"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "Tip"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "Descriere"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
 msgstr ""
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr ""
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, fuzzy, c-format
 msgid ""
 "Can't open file :\n"
@@ -3236,7 +3302,7 @@ msgid ""
 "(%s)"
 msgstr "Nu pot deschide '%s' (%s)\n"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr ""
 
@@ -3495,27 +3561,54 @@ msgstr ""
 "transferate programului (ca 'xmms -p') �nainte s� primeasc� fi�ierele ca "
 "argumente."
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Op�iunile etichetei"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "Centrul ecranului"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr "Daca este activata, lista va fi creata in directorul parinte.."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 #, fuzzy
 msgid "File Settings"
 msgstr "_Setari"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 #, fuzzy
 msgid "File Options"
 msgstr "Op�iuni ale numelui de fi�ier"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr ""
 "�nlocuieste caracterele gresite din numele de fisier (pentru Windows si CD-"
 "ROM)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3528,52 +3621,52 @@ msgstr ""
 "redenumeste fisierul cu informatia din eticheta de catre examinator."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "Conversie extensie de fisier la:"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "Minuscule"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "De ex. extensia va fi convertita la '.mp3'"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "Majuscule"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "De ex. extensia va fi convertita la '.MP3'"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "Nici o schimbare"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "Extensia nu va fi convertita"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr ""
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3584,48 +3677,48 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 #, fuzzy
 msgid "Character Set for File Name"
 msgstr "Setul de caractere pentru etichetele ID3"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
 msgstr ""
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr ""
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "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 ""
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
 "looking characters."
 msgstr ""
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3634,20 +3727,20 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "Setari etichete"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "Op�iunile etichetei"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "Autocompletarea datelor daca nu sint complete"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3657,11 +3750,11 @@ msgstr ""
 "datei (de ex., daca anul curent este 2005: 5 => 2005, 4 => 2004, 6 => 1996  "
 "95 => 1995, ...)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "Scrie c�mpul pistei cu urmatorul numar de cifre :"
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3671,11 +3764,11 @@ msgstr ""
 "completare pentru a obtine un numar cu 'n' cifre (Ex. cu doua cifre : '05, "
 "'09', '10',...). Altfel pastreaza valoarea 'bruta' a pistei."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Fi�iere Ogg Vorbis : scrie comentariul �i �n formatul XMMS"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3689,17 +3782,17 @@ msgstr ""
 "debifati aceast� op�iune dac� nu vre�i ca celelalte aplica�ii s� se pling� "
 "de un c�mp necunoscut. Comentariile nu o s� apar� �n XMMS �ns�."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr ""
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr ""
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr ""
 
@@ -3707,23 +3800,23 @@ msgstr ""
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 #, fuzzy
 msgid "ID3 Tag Settings"
 msgstr "Setari etichete"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "Regulile etichetei ID3"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 #, fuzzy
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "Scrie etichete ID3 in fisierele FLAC cu etichete FLAC"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3732,11 +3825,11 @@ msgstr ""
 "sf�rsitul fisierelor MP3. Altfel va fi stearsa."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "Sterge etichetele dac� toate c�mpurile s�nt goale"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3749,11 +3842,11 @@ msgstr ""
 "c�mpuri standard s�nt goale."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Schimb� automat versiunile vechi de etichete ID3v2"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3762,42 +3855,42 @@ msgstr ""
 "va fi actualizat� la versiunea ID3v2.3."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 #, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "Scrie etichet� ID3v2"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Setul de caractere pentru etichetele ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Scrie etichet� ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "Scrie etichet� ID3v2"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3807,12 +3900,12 @@ msgstr ""
 "�nceputul fi�ierelor MP3. Altfel eticheta va fi �tears�."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 #, fuzzy
 msgid "Version:"
 msgstr "Descriere:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3821,56 +3914,56 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Codor"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 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:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 #, fuzzy
 msgid "No"
 msgstr " Nu "
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "Etichet� ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "Scrie etichet� ID3v1.x"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3878,22 +3971,22 @@ 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:846
+#: src/prefs.c:878
 #, 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:878
+#: src/prefs.c:910
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Setul de caractere pentru etichetele ID3"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3910,7 +4003,7 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:914
+#: src/prefs.c:947
 msgid "Character set used to read tag data in the file."
 msgstr ""
 "Setul de caractere folsit pentru a citi informatiile din etichete din fisier."
@@ -3918,24 +4011,24 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Examinator"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Schimba caracterele"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Schimb� '_' �i '%20' �n spa�ii ' '"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Schimb� spa�iile �n '_'"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -3944,11 +4037,11 @@ msgstr ""
 "examinatorului de etichete."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Schimba caracterele"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -3957,17 +4050,17 @@ msgstr ""
 "examinatorului de fisiere."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 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:1001
+#: src/prefs.c:1034
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1005
+#: src/prefs.c:1038
 #, fuzzy
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
@@ -3980,15 +4073,15 @@ msgstr ""
 "cuvint'."
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Fereastra examinatorului"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Deschide fereastra examinatorului la pornire"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -3996,11 +4089,11 @@ msgstr ""
 "Activa�i aceast� op�iune pentru a deschide automat freastra examinatorului "
 "c�nd EasyTAG este pornit."
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Fereastra examinatorului tot timpul deasupra"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4009,16 +4102,16 @@ msgstr ""
 "fereastra principal�."
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "C�mpuri"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Suprascrie c�mpurile c�nd examinezi etichetele"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4027,11 +4120,11 @@ msgstr ""
 "noul text. Dac� este dezactivat�, numai c�mpurile goale ale etichetei vor fi "
 "completate."
 
-#: src/prefs.c:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "Fixeaz� acest text drept comentariu implicit :"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4040,13 +4133,13 @@ msgstr ""
 "comentariu c�nd folosi�i 'Completeaz� eticheta'."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 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:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4057,46 +4150,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "Baza de date CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Cautare automata"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "Nume :"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "Calea CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Set�ri server"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "Baza de date CD"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 #, fuzzy
 msgid "Path :"
 msgstr "Calea CGI :"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4105,59 +4198,59 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Set�ri proxy"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Folose�te proxy"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Fixeaz� active set�rile serverului proxy."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "Nume gazda :"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Numele serverlui proxy."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Portul serverlui proxy"
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "Nume utilizator:"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "Numele utilizatorului serverlui proxy."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "Parola utilizatorului:"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr "Parola utilizatorului serverlui proxy."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "Lista numelor de pista"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 #, 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:1320
+#: src/prefs.c:1353
 #, fuzzy
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
@@ -4167,7 +4260,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:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4176,15 +4269,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Confirm�ri"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Confirm� ie�irea din program"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4192,53 +4285,57 @@ msgstr ""
 "Dac� este activat�, deschide o fereastr� de dialog s� cear� confirmarea "
 "�nainte de p�rasirea programului."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "Confirm� scrierea etichetei fi�ierului"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "Confirm� redenumirea fi�ierului"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "Confirma stergerea fisierului"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "Confirm� scrierea playlist"
 
-#: src/prefs.c:1389
+#. 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:1422
 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:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "�nchide fereastra f�r� s� salvezi"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 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:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "Schimb�rile aplicate"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "Configura�ia salvat�"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "Configura�ia neschimbat�"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4249,11 +4346,11 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "Nu este director"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
@@ -4270,37 +4367,37 @@ msgstr "Redenumeste fisierul si directorul"
 msgid "Process Fields"
 msgstr "Prelucreaz� fi�ierele"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "Eticheta examinat� cu succes..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Eticheta examinata cu succes...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, 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:660
+#: src/scan.c:663
 #, 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:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "Noul nume de fi�ier examinat cu succes..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Noul nume de fi�ier examinat cu succes...(%s)"
@@ -4308,41 +4405,41 @@ msgstr "Noul nume de fi�ier examinat cu succes...(%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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "Examinarea etichetei �i numelui de fi�ier"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Examinator :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "Alege�i tipul de examinator"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Deschide fereastra examinatorului / Examinati fisierele alese"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Op�iunile examinatorului"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Arat� / ascunde editorul mask"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Arat� / ascunde legenda"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "�nchide aceast� fereastr�"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4352,15 +4449,15 @@ msgstr ""
 "etichetei."
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "Completeaza previzualizarea etichetei..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr "Pune calea actuala inaintea mastii"
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4373,15 +4470,15 @@ msgstr ""
 "cale absoluta, altfel este relativ la vechea cale."
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "Previziualizeaz� redenumirea fi�ierului"
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Alege�i c�mpurile:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4390,126 +4487,126 @@ msgstr ""
 "Alege�i acelea care v� intereseaz�."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 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:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "Prelucrez c�mpul titlu"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "Prelucrez c�mpul artist"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Prelucrez c�mpul album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "Prelucrez c�mpul gen"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "Prelucrez c�mpul comentariu"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Prelucrez c�mpul compozitor"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 msgid "Process original artist field"
 msgstr "Prelucrez c�mpul artist initial"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Prelucrez c�mpul 'drept de autor'"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "Prelucrez c�mpul URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "Prelucrez c�mpul nume de codor"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Inveseaz� alegerea"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Alege/dealege toate."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Schimb� '_' �i '%20' �n ' '"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Conversie :"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "la : "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4517,7 +4614,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:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4525,11 +4622,12 @@ msgstr ""
 "Spa�iul este �nlocuit de un '_'. Examplu, �nainte: 'text introdus', dup�: "
 "'text_introdus'."
 
-#: src/scan.c:2171
-msgid "Replace a character by an other one."
-msgstr "Inlocuiti caracterul cu un altul."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4537,7 +4635,7 @@ msgstr ""
 "Schimb� toate cuvintele �n toate c�mpurile �n majuscule. Exemplu, �nainte "
 "'Text INTROUDS', dup�: 'TEXT INTRODUS'."
 
-#: src/scan.c:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4545,7 +4643,7 @@ msgstr ""
 "Schimb� toate cuvintele �n toate c�mpurile �n minuscule. Exemplu, �nainte: "
 "'TEXT �nainte', dup�: 'text �nainte'."
 
-#: src/scan.c:2209
+#: src/scan.c:2325
 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'."
@@ -4553,7 +4651,7 @@ msgstr ""
 "Schimb� ini�iala primului cuv�nt �n toate c�mpurile �n majuscul�. Exemplu "
 "�nainte: 'tEXt �nainte', dup�: 'Text �nainte'."
 
-#: src/scan.c:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4561,15 +4659,15 @@ msgstr ""
 "Schimb� ini�iala fiec�rui cuv�nt �n toate c�mpurile �n majuscul�. Exemplu "
 "�nainte: 'tEXt �nainte', dup�: 'Text �nainte'."
 
-#: src/scan.c:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Introdu un spa�iu �nainte de o majuscul�"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "�terge spa�iile sau '_' multiple"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4577,7 +4675,7 @@ msgstr ""
 "Toate pa�iile dintre cuvinte s� fie �terse. Exemplu, �nainte: 'Text "
 "�nainte', dup�: 'Text�nainte'."
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4585,7 +4683,7 @@ msgstr ""
 "Un spa�iu este introdus �nainte de fiecare majuscul�. Exemplu, �nainte: "
 "'Text�nainte', dup�: 'Text �nainte'."
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4596,189 +4694,189 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "Legend�"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artist"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : comentariu"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%c : compozitor"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r: drept autor"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr ""
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e: codat de"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : gen"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorat"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : num�r de piste"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%a : artist initial"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : pist�"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : titlu"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : an"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Editor de m�ti"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "Creaz� o masc� nou�"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Mut� sus aceast� masc�"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Mut� jos aceast� masc�"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Copiaz� masca"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Adaug� o masc� implicit�"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "�terge masca"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Salveaz� masca"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "Masc� nou�"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "Copiaz�: Nici un r�nd ales!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "�terge: Nici un r�nd ales!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Mut� sus: Nici un r�nd ales!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Mut� jos: Nici un r�nd ales!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
-msgstr "Eroare: Nu pot scrie fisierul configuratie: %s (%s)"
+msgstr "Eroare: Nu pot scrie fisierul configuratie: %s (%s)\a"
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Nu pot deschide fi�ierul configura�ie '%s' (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "�ncarc configura�ia implicit�..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Nu pot crea sau deschide '%s' (%s)"
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
 "Eroare: Nu pot scrie lista �n fisier: %s (%s)\n"
-""
+"\a"
 
 #. Fall back to defaults
-#: src/setting.c:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "�ncarc mask 'Completeaz� eticheta' implicit..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "�ncarc mask-ul 'Redenume�te fi�ierul' implicit..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 #, fuzzy
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "�ncarc mask-ul 'Redenume�te fi�ierul' implicit..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "Eroare: Variabila de mediu $HOME nu este definit�!\n"
 "\n"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "Eroare: Nu pot crea directorul '%s' (%s)!"
@@ -4864,6 +4962,36 @@ msgstr "Execut� playerul audio"
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Calea introdus� nu este valid�!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Cu majuscule seminifcative"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Inlocuiti caracterul cu un altul."
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Con�inutul fi�ierului �ncarcat :"
+
+#~ msgid "Files Name List :"
+#~ msgstr "Lista numelor de fi�iere :"
+
+#, fuzzy
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(Suportul pentru FLAC dezactivat)"
+
+#, fuzzy
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(Suportul pentru FLAC dezactivat)"
+
 #, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "Versiune de etichet� incorect�"
@@ -4907,10 +5035,10 @@ msgstr ""
 #~ "la '%s' nu este suportat�!"
 
 #, fuzzy
-#~ msgid "ERROR while opening file: '%s' (%s)"
+#~ msgid "ERROR while opening file: '%s' (%s)\a"
 #~ msgstr ""
 #~ "Eroare �n timpul deschiderii fisierului: '%s' (%s).\n"
-#~ ""
+#~ "\a"
 
 #~ msgid "Load on startup the directory"
 #~ msgstr "�ncarc� la pornire directorul"
@@ -5146,10 +5274,10 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "ERROR while opening file: '%s'(%s).\n"
-#~ ""
+#~ "\a"
 #~ msgstr ""
 #~ "Eroare �n timpul deschiderii fisierului: '%s' (%s).\n"
-#~ ""
+#~ "\a"
 
 #, fuzzy
 #~ msgid "AAC/MPEG-4 File"
diff --git a/po/ru.gmo b/po/ru.gmo
index 2c8b702..34ad2dd 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index ed8616f..6f2ce6c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Easytag 1.99.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2005-12-24 12:57+0300\n"
 "Last-Translator: Andrey Astafiev <andrei@altlinux.ru>\n"
 "Language-Team: ALT Linux Translation <ru@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Poedit-Language: Russian\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
@@ -27,189 +27,231 @@ msgstr ""
 "MP3, MP2, FLAC, MusePack, MP4/AAC, Monkey's Audio и Ogg Vorbis с удобным "
 "интерфейсом GTK+ для GNU/Linux."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(перевод на немецкий)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(перевод на русский)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(перевод на голландский)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(перевод на шведский)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(перевод на венгерский)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(перевод на итальянский)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(перевод на японский)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(перевод на украинский)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(перевод на чешский)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(перевод на испанский)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(перевод на польский)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(перевод на румынский)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(перевод на датский)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(перевод на греческий)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(перевод на бразильский португальский)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(перевод на болгарский)"
 
-#: src/about.c:160
+#: src/about.c:171
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(перевод на японский)"
 
-#: src/about.c:161
+#: src/about.c:172
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(перевод на греческий)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(перевод на немецкий)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Комментарий"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "О программе..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "О программе"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(скомпилировано: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(используются: GTK+ %d.%d.%d и id3lib %d.%d.%d)"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(поддержка MP3 отключена)"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "Автор: %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(поддержка MP3 отключена)"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "Эл. адрес: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Веб-страница:"
 
-#: src/about.c:292
+#: src/about.c:328
+msgid "Description:"
+msgstr "Описание:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "(поддержка MP3 отключена)"
 
-#: src/about.c:296
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
 #, c-format
-msgid "(MP3 file support disabled)"
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
 msgstr "(поддержка MP3 отключена)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "Не хватает памяти"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(поддержка Ogg Vorbis отключена)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(поддержка MP3 отключена)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(поддержка FLAC отключена)"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
 msgstr "(поддержка MP4/AAC отключена)"
 
-#: src/about.c:322
+#: src/about.c:460
 #, fuzzy
-msgid "(WavPack file support disabled)"
+msgid "WavPack file support"
 msgstr "(поддержка MP3 отключена)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "Автор: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "Эл. адрес: %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Веб-страница:"
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "Описание:"
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "Благодарности"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "Переводы:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "Общее:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "Изменения"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -542,7 +584,7 @@ msgstr "Переименовать к_аталог..."
 msgid "Reload Directory"
 msgstr "Обновить каталог"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "Просмотреть каталог с помощью..."
 
@@ -687,7 +729,7 @@ msgstr "Выбран новый путь по умолчанию для файл
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Подтвердить..."
 
@@ -699,87 +741,66 @@ msgstr ""
 "Некоторые файлы были изменены, но не сохранены...\n"
 "Сохранить изменения перед сменой каталога?"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"Введённый путь недопустим!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "Ошибка..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 #, fuzzy
 msgid "<All albums>"
 msgstr "# Альбомы"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Ошибка: Поиск %s, не удалось найти узел %s в дереве."
 
-#: src/browser.c:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# Альбомы"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# Файлы"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Альбом"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Перейти на уровень выше"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Перейти к каталогу"
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Дерево"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "Исполнитель и альбом"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "Переименовать каталог"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Переименовать каталог '%s' в:"
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "Использовать маску:"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 msgid "If activated, it will use masks to rename directory."
 msgstr "Если выбрано, маски будут использоваться для переименования каталогов."
 
-#: src/browser.c:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -787,21 +808,31 @@ msgstr ""
 "Выберите или введите маску, используя приведённые в подсказке, для "
 "переименования каталога из полей тегов."
 
-#: src/browser.c:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "Недопустимая маска для сканера"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "Предварительное переименование каталогов..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Ошибка..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "Необходимо ввести имя каталога!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -830,7 +861,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -839,7 +870,7 @@ msgstr ""
 "Невозможно переименовать, так как каталог с таким именем уже существует!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -854,49 +885,49 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "Каталог переименован"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Программа для запуска:"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Введите имя программы. В качестве параметра ей будет передан текущий каталог."
 
-#: src/browser.c:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "Открыть файл с помощью..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Введите имя программы. В качестве параметра ей будет передан текущий файл."
 
-#: src/browser.c:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "Необходимо ввести название программы!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Программа '%s' не найдена!"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Не могу выполнить %s (ошибка %d)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "Не удалось создать новый процесс!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Выполненная команда: '%s %s'"
@@ -985,7 +1016,7 @@ msgstr "Поиск в:"
 msgid "All Fields"
 msgstr "Все поля"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Прочее"
 
@@ -1060,7 +1091,7 @@ msgstr "Категории"
 msgid "Results :"
 msgstr "Результаты:"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "Поиск:"
 
@@ -1089,7 +1120,7 @@ msgstr "Отменить выделение"
 msgid "Invert lines selection"
 msgstr "Инвертировать выделение"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "Выделить все строки"
 
@@ -1114,15 +1145,15 @@ msgstr "Установить в:"
 msgid "All"
 msgstr "Все"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "Имя файла"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "Название"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "Год"
 
@@ -1134,12 +1165,12 @@ msgstr "Дорожка #"
 msgid "# Tracks"
 msgstr "# дорожки"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "Жанр"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Выполнить сканирование для каждого файла"
 
@@ -1151,7 +1182,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1167,11 +1198,11 @@ msgstr ""
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Загрузить выделенные строки или все строки (если нет выделенных)."
 
-#: src/cddb.c:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Готов к поиску..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1179,76 +1210,76 @@ msgstr ""
 "Альбом: '%s', исполнитель: '%s', общее время: '%s', год: '%s', жанр: '%s', "
 "ID: '%s'"
 
-#: src/cddb.c:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Инвертировать выделение"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Сортировать по номеру дорожки"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Сортировать по имени дорожки"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Поиск узла '%s' ..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Не удалось найти узел '%s' (%s)!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Не удалось создать новое соединение (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Подключение к серверу '%s', порт '%d'..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Не удалось подключиться к серверу '%s' (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Установлено соединение с '%s'"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Получение данных (%s) ..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Ошибка при удалении тега ID3v1 в '%s' (%s)\n"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Не удалось создать или открыть файл '%s' (%s)\n"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Не открывается файл '%s' (%s)"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "Отправляется запрос..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Не удалось отправить запрос (%s)!"
@@ -1257,91 +1288,91 @@ msgstr "Не удалось отправить запрос (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "Получение данных..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "Сервер вернул неправильный ответ! (%s)"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Сервер вернул неправильный ответ! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Поиск в веб сейчас недоступен!"
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Найдено %d подходящих альбомов"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Получение данных (%s) ..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Получение данных (%s) ..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "Выделено %d файл(ов)!"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Готов к поиску..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Отправляется запрос (CddbId: %s, #дорожек: %d, общее время: %d) ..."
 
-#: src/cddb.c:3231
+#: src/cddb.c:3268
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Найдено %d подходящих альбомов"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Не открывается файл '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "Загружается список дорожек альбома..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1354,7 +1385,7 @@ msgstr ""
 "\n"
 "Продолжить?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "Записывается тег из CDDB..."
 
@@ -1627,11 +1658,11 @@ msgstr "Недействительная ссылка на файл"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Уровень ?"
 
@@ -1639,7 +1670,7 @@ msgstr "?, Уровень ?"
 msgid "Bitrate:"
 msgstr "Скорость потока:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? кб/c"
 
@@ -1647,17 +1678,17 @@ msgstr "? кб/c"
 msgid "Freq:"
 msgstr "Частота:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Гц"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Режим:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1841,13 +1872,13 @@ msgid "Tag selected files with these pictures"
 msgstr "Записать картинки в теги выделенных файлов"
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
-msgstr "Удалить все или выбранные картинки"
-
-#: src/easytag.c:1051
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Добавить картинки в тег."
 
+#: src/easytag.c:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "Удалить все или выбранные картинки"
+
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "Сохранить выделенные картинки на диск."
@@ -2219,7 +2250,7 @@ msgstr "Удалить файл..."
 msgid "File '%s' deleted"
 msgstr "Файл '%s' удалён"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2231,109 +2262,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "Выполняется поиск..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "Файл: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Найдено %d файлов в каталоге и его подкаталогах."
 
-#: src/easytag.c:3235
+#: src/easytag.c:3239
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "В каталоге найдено %d файл(ов)."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u файл(ов)"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr "В этом каталоге и его подкаталогах  файлы не найдены!"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "В этом каталоге файлы не найдены!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Поиск..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "Остановить поиск..."
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "Выберите каталог для просмотра!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "Записать это поле в теги выделенных файлов"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Преобразовать '_' и '%20' в пробелы"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "Преобразовать ' ' в '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "Всё заглавными"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "Всё строчными"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "Первая заглавная"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "Каждое слово начинается с заглавной буквы"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "Удалить пробелы"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Вставить пробел перед заглавной буквой"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 msgid "Remove duplicate spaces or underscores"
 msgstr "Удалять повторяющиеся пробелы и подчёркивания"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Выход из-за сбоя!. (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, fuzzy, c-format
-msgid "Received signal %s (%d)"
-msgstr "Получен сигнал %s (%d)\n"
+msgid "Received signal %s (%d)\a"
+msgstr "Получен сигнал %s (%d)\a\n"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2343,12 +2374,12 @@ msgstr ""
 "ошибке с текстом обратной трассировки, создаваемым программой gdb ('gdb "
 "easytag core' затем  'bt' и 'l') по адресу easytag@gmail.com"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Неизвестный сигнал"
 
-#: src/easytag.c:4466
-#, fuzzy
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2361,8 +2392,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2381,11 +2411,11 @@ msgstr ""
 "путь_к/файлам     Использовать относительный путь.\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Выход."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2393,7 +2423,7 @@ msgstr ""
 "Есть несохраненные изменения...\n"
 "Записать их перед выходом?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr "Вы действительно хотите закрыть программу?"
 
@@ -2491,7 +2521,7 @@ msgstr ""
 "в системную кодировку для имён файлов\n"
 "(Попробуйте установить переменную окружения G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "Перевод имени файла"
 
@@ -2524,7 +2554,7 @@ msgstr "Каналы:"
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "ОШИБКА при открытии файла: '%s' (%s).\n"
-""
+"\a"
 
 #: src/flac_tag.c:983 src/ogg_tag.c:752
 #, c-format
@@ -2654,123 +2684,123 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "Повреждённый файл..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr "OK"
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr "Да"
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr "Нет"
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr "Применить"
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr "Сохранить"
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr "Отменить"
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr "Закрыть"
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr "Записать"
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr "Выполнить"
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr "Поиск"
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr "Просмотр..."
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "Выберите каталог..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "Выберите файл..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 #, fuzzy
 msgid "Warning..."
 msgstr "Поиск..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Не удалось выполнить %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "Б"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "КБ"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "МБ"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "ГБ"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "ТБ"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "Создать список записей"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "Название списка записей M3U"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "Использовать имя каталога"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Редактировать маски"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "Параметры списка записей"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Включать только выделенные файлы"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2778,51 +2808,51 @@ msgstr ""
 "Если выбрано, только выделенные файлы будут помещаться в список записей, "
 "иначе будут использованы все файлы."
 
-#: src/misc.c:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "Использовать абсолютный путь для файлов в списке записей"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 msgid "Use relative path for files in playlist"
 msgstr "Использовать относительный путь для файлов в списке записей"
 
 #. Create playlist in parent directory
-#: src/misc.c:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "Создавать список записей в родительском каталоге"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Если выбрано, список записей будет создаваться в родительском каталоге"
 
 #. DOS Separator
-#: src/misc.c:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "Использовать разделитель каталогов DOS"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr "Заменить разделитель каталогов '/' на разделитель в стиле DOS '\\'."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "Содержимое списка записей"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "Записать только список файлов"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "Записать информацию, используя имя файла"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Записать информацию используя:"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2831,12 +2861,12 @@ msgstr ""
 "Файл списка записей '%s' уже существует!\n"
 "Перезаписать его?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "Сохранить список записей..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2845,101 +2875,136 @@ msgstr ""
 "Не удалось сохранить список записей  '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Сохранён список записей '%s'"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "Дорожка"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Комментарий"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "Композитор"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "Первый исполнитель"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Авторство"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "Ссылка (URL)"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "Кодировщик"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "Искать файл"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr "Введите слово для поиска в файлах. "
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "В:"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "Тег"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Учитывать регистр"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Найден(о): %d файл(ов)"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "Загрузить имена файлов из файла"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 msgid "File :"
 msgstr "Файл:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr "Загрузить"
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "Загружено содержимое файла:"
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "Подтверждать переименования файла"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "Вставить пробел перед заглавной буквой"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Удалить эту строку"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "Список имён файлов:"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "Удалить все пустые строки"
 
-#: src/misc.c:2828
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "Включать только выделенные файлы"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "Включать только выделенные файлы"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Перезагрузить"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Записать только список файлов"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Выделить все строки"
+
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2947,21 +3012,23 @@ msgstr ""
 "Если выбрано, то после загрузки всех имен файлов текущие установки сканера "
 "будут применены (окно сканера должно быть открыто)."
 
-#: src/misc.c:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "Вставить пустую строку"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "Удалить эту строку"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "Удалить все пустые строки"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Переместить выбранную маску вверх"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "Перезагрузить"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Переместить выбранную маску вниз"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3096,122 +3163,122 @@ msgstr ""
 msgid "Save file..."
 msgstr "Сохранить файл..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "Картинка JPEG"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "Картинка PNG"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "Неизвестное тип картинки"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "Пиктограмма размером 32x32 формата PNG"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "Другая пиктограмма файла"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "Обложка (спереди)"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "Обложка (сзади)"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "Обложка внутри"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "Носитель (например, лицевая сторона компакт-диска)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "Солист/вокалист"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "Артист/исполнитель"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "Дирижёр"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "Группа/оркестр"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "Автор стихов/текста"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "Место записи"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "Во время записи"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "Во время исполнения"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "Кадр из фильма/съёмки"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "Ярко раскрашенная рыба"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "Иллюстрация"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "Логотип исполнителя"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "Логотип студии/издателя"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "Неизвестный тип изображения"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "пиксели"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "Тип"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "Описание"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
 msgstr ""
 "Невозможно показать изображение. Недостаточно данных для создания буфера."
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "Загружается файл изображения..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3222,7 +3289,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "Файл с изображением на загружен..."
 
@@ -3472,23 +3539,50 @@ msgstr ""
 "некоторые аргументы (например, xmms -p) перед списком файлов в качестве "
 "остальных аргументов."
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Параметры тега"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "Центр главного окна"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr "Если выбрано, список записей будет создаваться в родительском каталоге"
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "Файловые настройки"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "Параметры файла"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr "Заменять недопустимые символы в имени файлы (для Windows и CD-ROM)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3501,52 +3595,52 @@ msgstr ""
 "помощью сканера."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "Преобразовать расширение в:"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "Нижний регистр"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "Например, расширение будет преобразовано в '.mp3'"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "Верхний регистр"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "Например, расширение будет преобразовано в '.MP3'"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "Без изменений"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "Расширение не будет преобразовано"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "Сохранить время модификации файла"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr "Сохранить время модификации файла при сохранении."
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3557,12 +3651,12 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr "Кодировка для имён файлов"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
@@ -3570,11 +3664,11 @@ msgstr ""
 "Правила, выполняемые, если некоторые символы невозможно преобразовать в "
 "системную кодировку при записи имени файла:"
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "Пробовать другую кодировку"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
@@ -3585,13 +3679,13 @@ msgstr ""
 "'ru', ISO-8859-2 для 'ro'). В случае ошибки будет выбрана кодировка ISO-8859-"
 "1."
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 "Принудительно использовать системную кодировку и активировать транслитерацию"
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3600,7 +3694,7 @@ msgstr ""
 "Если выбрано, символ, которого нет в целевой кодировке, может быть "
 "представлен с помощью одного или нескольких похожих символов."
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
@@ -3608,7 +3702,7 @@ msgstr ""
 "Принудительно использовать системную кодировку и игнорировать некорректные "
 "символы"
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3618,20 +3712,20 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "Настройки тегов"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "Параметры тега"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "Автодополнение даты, если введена не полностью"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3641,11 +3735,11 @@ msgstr ""
 "последние цифры (например, если сейчас 2005 год: 5 => 2005, 4 => 2004, 6 => "
 "1996, 95 => 1995, ...)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "Записывать в поле Дорожка указанное количество цифр:"
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3655,11 +3749,11 @@ msgstr ""
 "'n' знаков. (Например, для двух знаков: '05', '09', '10',...). Иначе "
 "используется обычный вид числа."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Файлы Ogg Vorbis: Записать комментарий также и в формате XMMS"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3673,18 +3767,18 @@ msgstr ""
 "если вы не хотите, чтобы другие приложения сообщали о неизвестном поле. "
 "Однако в этом случае комментарии не будут отображаться в XMMS."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr ""
 "Фокусировка поля тега при выборе файлов в списке клавишами Page Up/Page Down:"
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr "Оставлять фокус в том же поле тега"
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr "Вернуть фокус на первое поле тега (поле 'Название')"
 
@@ -3692,22 +3786,22 @@ msgstr "Вернуть фокус на первое поле тега (поле
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "Настройки тегов ID3"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "Правила тегов ID3"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 #, fuzzy
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "Записывать в файлы FLAC теги ID3 вместе с тегами FLAC"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3717,11 +3811,11 @@ msgstr ""
 "будут удалены."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "Удалить теги, если все поля пусты"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3733,11 +3827,11 @@ msgstr ""
 "тег, если все поля, с которыми работает EasyTAG пусты."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Автоматически преобразовывать старые версии тегов ID3v2"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3746,42 +3840,42 @@ msgstr ""
 "ID3v2.3"
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 #, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "Записывать тег ID3v2"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Кодировка для тегов ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Записывать тег ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "Записывать тег ID3v2"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3791,12 +3885,12 @@ msgstr ""
 "Иначе они будут отрезаны."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 #, fuzzy
 msgid "Version:"
 msgstr "Описание:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3805,56 +3899,56 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 #, fuzzy
 msgid "Unicode "
 msgstr "Юникод (Unicode) (UTF-8)"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Кодировщик"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 msgid "Character set used to write the tag data in the file."
 msgstr "Кодировка, используемая для записи тега в файл."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 #, fuzzy
 msgid "No"
 msgstr "Нет"
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "Тег ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "Записывать тег ID3v1.x"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3862,22 +3956,22 @@ msgstr ""
 "Если выбрано, теги ID3v1 будут добавлены или обновлены в конце МР3 файлов. "
 "Иначе они будут отрезаны."
 
-#: src/prefs.c:846
+#: src/prefs.c:878
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Кодировка, используемая для записи тега в файл."
 
 #. Character Set for reading tag
-#: src/prefs.c:878
+#: src/prefs.c:910
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Кодировка для тегов ID3"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3902,31 +3996,31 @@ msgstr ""
 "эту опцию и выделите UTF-8.- если Unicode не используется, можно выбрать "
 "другую корировку."
 
-#: src/prefs.c:914
+#: src/prefs.c:947
 msgid "Character set used to read tag data in the file."
 msgstr "Кодировка, используемая для чтения тега в файле."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Сканер"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Сканер заполнения тегов - Преобразование символов"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Заменять подчеркивания '_' и строки '%20' на пробелы ' '"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Преобразовывать пробел ' ' в подчёркивание '_'"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -3935,11 +4029,11 @@ msgstr ""
 "сканера для тегов."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Сканер переименования файлов - Преобразование символов"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -3948,17 +4042,17 @@ msgstr ""
 "сканера для имён файлов."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Сканер обработки полей - Преобразование символов"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1001
+#: src/prefs.c:1034
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "Не переводить в верхний регистр первые буквы предлогов и артиклей."
 
-#: src/prefs.c:1005
+#: src/prefs.c:1038
 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 "
@@ -3970,15 +4064,15 @@ msgstr ""
 "слово начинается с заглавной буквы'."
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Окно сканера"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Открывать окно сканера при запуске"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -3986,11 +4080,11 @@ msgstr ""
 "Если выбрано, окно сканера будет появляться автоматически при загрузке "
 "EasyTAG."
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Окно сканера всегда поверх других окон"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -3998,16 +4092,16 @@ msgstr ""
 "Если выбрано, окно с масками будет всегда находиться поверх главного окна."
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "Поля"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Заменять поля при сканировании тегов"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4015,11 +4109,11 @@ msgstr ""
 "Если выбрано, сканер будет заменять существующий текст в полях на новый, "
 "иначе будут заполняться только пустые поля."
 
-#: src/prefs.c:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "Комментарий по умолчанию:"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4028,13 +4122,13 @@ msgstr ""
 "использовании сканера заполнения тегов."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Записывать контрольную сумму CRC32 в поле 'Комментарий' (только для тегов "
 "ID3)."
 
-#: src/prefs.c:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4045,46 +4139,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "База данных CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Автоматический поиск"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "Имя:"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "Порт сервера:"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "Путь к CGI:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Установки сервера"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "База данных CD"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 #, fuzzy
 msgid "Path :"
 msgstr "Путь к CGI:"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4093,58 +4187,58 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Настройки прокси-сервера"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Использовать прокси"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Активировать настройки прокси-сервера."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "Имя сервера:"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Имя прокси-сервера."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Порт прокси-сервера."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "Имя пользователя:"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "Имя для авторизации на прокси-сервере."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "Пароль:"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr "Имя для авторизации на прокси-сервере."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "Список названий дорожек"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr "Выберите соответствующий файл (в зависимости от позиции или DLM)"
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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."
@@ -4153,7 +4247,7 @@ msgstr ""
 "будет выделен соответствующий файл."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4164,15 +4258,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Подтверждения"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Подтверждать выход из программы"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4180,53 +4274,57 @@ msgstr ""
 "Если выбрано, перед выходом из приложения будет появляться диалоговое окно "
 "для подтверждения."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "Подтверждать запись тега в файл"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "Подтверждать переименования файла"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "Подтверждать удаление файла"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "Подтверждать сохранение списка записей"
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Применить изменения (но не сохранять) и закрыть это окно"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "Закрывать это окно без сохранения"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 msgid "Save changes and close this window"
 msgstr "Сохранить изменения и закрыть окно"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Пример : %.*d_-_Название_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "Изменения применены"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "Настройки сохранены"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "Настройки не изменились"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4237,11 +4335,11 @@ msgstr ""
 "'%s'\n"
 " (%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "Не является каталогом"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Проигрыватель аудиофайлов '%s' не найден!"
@@ -4258,36 +4356,36 @@ msgstr "Переименовать файл и каталог"
 msgid "Process Fields"
 msgstr "Обработать поля"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "Теги успешно прочитаны..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Теги успешно прочитаны...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Ошибка сканирования: не найден разделитель '%s' в '%s'"
 
-#: src/scan.c:660
+#: src/scan.c:663
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Не удалось преобразовать '%s' в системную кодировку для имён файлов."
 
-#: src/scan.c:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "Новое имя файла было просканировано..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Новое имя файла было просканировано...(%s)"
@@ -4295,41 +4393,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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "Сканер тегов и имён файлов"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Сканер:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "Выберите тип используемого сканера"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Открыть окно сканера / Сканировать выбранные файлы"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Параметры сканера"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Показать/скрыть редактор масок"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Показать/скрыть подсказку"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "Закрыть это ок_но"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4338,15 +4436,15 @@ msgstr ""
 "пути и имени файла. Используется для заполнения полей тегов."
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "Предварительный просмотр заполнения тега"
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr "Добавить к маске текущий путь"
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4359,15 +4457,15 @@ msgstr ""
 "абсолютный, иначе относительный."
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "Предварительный просмотр переименования файла"
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Выбрать поля:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4376,126 +4474,126 @@ msgstr ""
 "которые вас интересуют."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "Обработать поле 'Имя файла'"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "Обработать поле 'Название'"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "Обработать поле 'Исполнитель'"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Обработать поле 'Альбом'"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "Обработать поле 'Жанр'"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "Обработать поле 'Комментарий'"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Обработать поле 'Композитор'"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 msgid "Process original artist field"
 msgstr "Обработать поле 'Первый исполнитель'"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Обработать поле 'Авторское право'"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "Обработать поле 'Ссылка (URL)'"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "Обработать поле 'Кодировщик'"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Инвертировать выделение"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Выделить/Снять выделение"
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Преобразовать '_' и '%20' в ' '"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Преобразовать:"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "в: "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4503,7 +4601,7 @@ msgstr ""
 "Подчеркивание или подстрока '%20' будет заменены на пробел. Например, 'Текст%"
 "20В_Поле' будет заменено на 'Текст В Поле'."
 
-#: src/scan.c:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4511,11 +4609,12 @@ msgstr ""
 "Пробел будет заменён на подчеркивание. Например, 'Текст В Поле' будет "
 "заменено на 'Текст_В_Поле'."
 
-#: src/scan.c:2171
-msgid "Replace a character by an other one."
-msgstr "Заменить один символ на другой."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4523,7 +4622,7 @@ msgstr ""
 "Все слова во всех полях будут переведены в верхний регистр. Например, 'Текст "
 "В Поле' будет заменено на 'ТЕКСТ В ПОЛЕ'."
 
-#: src/scan.c:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4531,7 +4630,7 @@ msgstr ""
 "Все слова во всех полях будут переведены в нижний регистр. Например, 'ТексТ "
 "В Поле' будет заменено на 'текст в поле'."
 
-#: src/scan.c:2209
+#: src/scan.c:2325
 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'."
@@ -4539,7 +4638,7 @@ msgstr ""
 "Первые слова во всех полях будут начинаться с заглавной буквы. Например, "
 "'текст В Поле' будет заменено на 'Текст в поле'."
 
-#: src/scan.c:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4547,15 +4646,15 @@ msgstr ""
 "Все слова во всех полях будут начинаться с заглавной буквы. Например, 'текст "
 "в Поле' будет заменено на 'Текст В Поле'."
 
-#: src/scan.c:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Вставить пробел перед заглавной буквой"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "Удалить повторяющиеся пробелы или подчёркивания"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4563,7 +4662,7 @@ msgstr ""
 "Все пробелы между словами будут удалены. Например, 'Текст В Поле' будет "
 "заменено на 'ТекстВПоле'."
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4571,7 +4670,7 @@ msgstr ""
 "Перед каждой заглавной буквой будет вставлен пробел. Например, 'ТекстВПоле' "
 "будет заменено на 'Текст В Поле'."
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4582,190 +4681,190 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "Подсказка"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a: Исполнитель"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b: Альбом"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c: Комментарий"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p: Композитор"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r: Авторское право"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d: номер диска"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e: Кодировщик"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g: Жанр"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i: Не используется"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l: Количество дорожек"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o: Первый исполнитель"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n: Дорожка"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t: Название"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u: Ссылка (URL)"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y: Год"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Редактор масок"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "Создать новую маску"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Переместить выбранную маску вверх"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Переместить выбранную маску вниз"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Дублировать маску"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Удалить маски по умолчанию"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "Удалить маску"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Сохранить маски"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "Новая_маска"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "Копирование: Нет выбранных строк!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "Удаление: Нет выбранных строк!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Вниз: Строка не выбрана!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Вверх: Строка не выбрана!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 "ОШИБКА: Не удалось сохранить файл настроек: %s (%s)\n"
-""
+"\a"
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Не удалось открыть файл настроек '%s' (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "Загружаются настройки по умолчанию..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Не удалось создать или открыть файл '%s' (%s)"
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
 "ОШИБКА: Не удалось сохранить список в файл: %s (%s)\n"
-""
+"\a"
 
 #. Fall back to defaults
-#: src/setting.c:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Загрузка масок по умолчанию для заполнения тегов..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "Загрузка масок по умолчанию для переименования файлов..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Загрузка начальных масок для переименования каталогов..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "ОШИБКА: Переменная окружения HOME не определена!\n"
 "\n"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ОШИБКА: Не удалось создать каталог '%s' (%s)!"
@@ -4850,6 +4949,36 @@ msgstr "Запустить проигрыватель"
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Введённый путь недопустим!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Учитывать регистр"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Заменить один символ на другой."
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Загружено содержимое файла:"
+
+#~ msgid "Files Name List :"
+#~ msgstr "Список имён файлов:"
+
+#, fuzzy
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(поддержка MP3 отключена)"
+
+#, fuzzy
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(поддержка MP3 отключена)"
+
 #, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "Неправильная версия тега"
@@ -4981,10 +5110,10 @@ msgstr ""
 #~ "в '%s' не поддерживается!"
 
 #, fuzzy
-#~ msgid "ERROR while opening file: '%s' (%s)"
+#~ msgid "ERROR while opening file: '%s' (%s)\a"
 #~ msgstr ""
 #~ "ОШИБКА при открытии файла: '%s' (%s).\n"
-#~ ""
+#~ "\a"
 
 #~ msgid "Load on startup the directory"
 #~ msgstr "Читать каталог при запуске"
diff --git a/po/sr.gmo b/po/sr.gmo
new file mode 100644
index 0000000..76521f9
--- /dev/null
+++ b/po/sr.gmo
diff --git a/po/sr.po b/po/sr.po
new file mode 100644
index 0000000..a9477c5
--- /dev/null
+++ b/po/sr.po
@@ -0,0 +1,5002 @@
+# Serbian translation of EasyTAG
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the EasyTAG package.

+# Miloš Popović <gpopac@gmail.com>, 2007.

+# 

+msgid ""
+msgstr ""
+"Project-Id-Version: EasyTAG-2.1.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
+"PO-Revision-Date: 2007-09-04 09:53+0100\n"
+"Last-Translator: Милош Поповић <gpopac@gmail.com>\n"
+"Language-Team: Serbian <gnom@prevod.org>\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"
+"X-Poedit-Language: Serbian\n"
+"X-Poedit-Country: SERBIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: src/about.c:134
+msgid ""
+"    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
+"Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
+"GTK+ interface makes tagging easier under GNU/Linux."
+msgstr ""
+"    EasyTAG је алат за преглед и уређивање ознака у MP3, MP2, FLAC, Ogg "
+"Vorbis, MP4/AAC, MusePack и Monkey аудио датотекама. Његово једноставно и "
+"лепо ГТК+ окружење чини означавање у ГНУ/Линуксу системима лакшим."
+
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+msgid "(German translation)"
+msgstr "(Немачки превод)"
+
+#: src/about.c:146 src/about.c:147
+msgid "(Russian translation)"
+msgstr "(Руски превод)"
+
+#: src/about.c:148 src/about.c:149
+msgid "(Dutch translation)"
+msgstr "(Холандски превод)"
+
+#: src/about.c:150 src/about.c:151
+msgid "(Swedish translation)"
+msgstr "(Шветски превод)"
+
+#: src/about.c:152 src/about.c:153 src/about.c:154
+msgid "(Hungarian translation)"
+msgstr "(Мађарски translation)"
+
+#: src/about.c:155 src/about.c:156
+msgid "(Italian translation)"
+msgstr "(Италијански превод)"
+
+#: src/about.c:157
+msgid "(Japanese translation)"
+msgstr "(Јапански превод)"
+
+#: src/about.c:158 src/about.c:159
+msgid "(Ukrainian translation)"
+msgstr "(Украински превод)"
+
+#: src/about.c:160 src/about.c:161
+msgid "(Czech translation)"
+msgstr "(Чешки превод)"
+
+#: src/about.c:162 src/about.c:163 src/about.c:164
+msgid "(Spanish translation)"
+msgstr "(Шпански превод)"
+
+#: src/about.c:165
+msgid "(Polish translation)"
+msgstr "(Пољски превод)"
+
+#: src/about.c:166
+msgid "(Romanian translation)"
+msgstr "(Румунски превод)"
+
+#: src/about.c:167
+msgid "(Danish translation)"
+msgstr "(Дански превод)"
+
+#: src/about.c:168
+msgid "(Greek translation)"
+msgstr "(Грчки превод)"
+
+#: src/about.c:169
+msgid "(Brazilian Portuguese translation)"
+msgstr "(Бразилско-португалски превод)"
+
+#: src/about.c:170
+msgid "(Bulgarian translation)"
+msgstr "(Бугарски превод)"
+
+#: src/about.c:171
+msgid "(Chinese translation)"
+msgstr "(Кинески превод)"
+
+#: src/about.c:172
+msgid "(Hebrew translation)"
+msgstr "(Хебрејски превод)"
+
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(Немачки превод)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Коментар"
+
+#. Config
+#: src/about.c:244
+msgid "About..."
+msgstr "О програму..."
+
+#.
+#. * Tab for common informations
+#.
+#: src/about.c:262 src/bar.c:236
+msgid "About"
+msgstr "О програму"
+
+#: src/about.c:293
+#, c-format
+msgid "(compiled: %s)"
+msgstr "(Превео: %s)"
+
+#: src/about.c:297
+#, c-format
+msgid "(using: GTK+ %d.%d.%d)"
+msgstr "(Користи: GTK+ %d.%d.%d)"
+
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "Аутор: %s"
+
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "Мејл адреса: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Интернет страница: "
+
+#: src/about.c:328
+msgid "Description:"
+msgstr "Опис:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
+#, fuzzy
+msgid "MP3 file support"
+msgstr "(Подршка за MP3 датотеке је искључена)"
+
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
+#, c-format
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
+msgstr "(ID3v2.3 ознаке су искључене)"
+
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "Немате доступну меморију"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
+msgstr "(Подршка за Ogg Vorbis датотеке је искључена)"
+
+#: src/about.c:430
+#, fuzzy
+msgid "Speex file support"
+msgstr "(Подршка за Speex датотеке је искључена)"
+
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
+msgstr "(Подршка за FLAC датотеке је искључена)"
+
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
+msgstr "(Подршка за MP4/AAC датотеке је искључена)"
+
+#: src/about.c:460
+#, fuzzy
+msgid "WavPack file support"
+msgstr "(Подршка за WavPack датотеке је искључена)"
+
+#.
+#. * Tab for thanks
+#.
+#: src/about.c:473
+msgid "Thanks"
+msgstr "Захвалност"
+
+#: src/about.c:493
+msgid "Translations:\n"
+msgstr "Преводи:\n"
+
+#: src/about.c:521
+msgid "General:\n"
+msgstr "Опште:\n"
+
+#: src/about.c:538
+msgid "Changes"
+msgstr "Промене"
+
+#: src/about.c:560
+#, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
+#: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
+#, c-format
+msgid "ERROR while opening file: '%s' (%s)."
+msgstr "Грешка при отварању датотеке: „%s“ (%s)."
+
+#.
+#. * Main Menu Actions
+#.
+#: src/bar.c:146
+msgid "_File"
+msgstr "_Датотека"
+
+#: src/bar.c:147
+msgid "Sort list by tag"
+msgstr "Сортирај листу по ознаци"
+
+#: src/bar.c:148
+msgid "Sort list by property"
+msgstr "Сортирај листу по својству датотеке"
+
+#: src/bar.c:149
+msgid "Ascending by filename"
+msgstr "Растуће, по имену датотеке"
+
+#: src/bar.c:150
+msgid "Descending by filename"
+msgstr "Опадајуће, по имену датотеке"
+
+#: src/bar.c:151
+msgid "Ascending by creation date"
+msgstr "Растуће, по датуму настанка"
+
+#: src/bar.c:152
+msgid "Descending by creation date"
+msgstr "Опадајуће, по датуму настанка"
+
+#: src/bar.c:153
+msgid "Ascending by track number"
+msgstr "Растуће, по броју нумере"
+
+#: src/bar.c:154
+msgid "Descending by track number"
+msgstr "Опадајуће, по броју нумере"
+
+#: src/bar.c:155
+msgid "Ascending by title"
+msgstr "Растуће, по наслову"
+
+#: src/bar.c:156
+msgid "Descending by title"
+msgstr "Опадајуће, по наслову"
+
+#: src/bar.c:157
+msgid "Ascending by artist"
+msgstr "Растуће, по извођачу"
+
+#: src/bar.c:158
+msgid "Descending by artist"
+msgstr "Опадајуће, по извођачу"
+
+#: src/bar.c:159
+msgid "Ascending by album"
+msgstr "Растуће, по албуму"
+
+#: src/bar.c:160
+msgid "Descending by album"
+msgstr "Опадајуће, по албуму"
+
+#: src/bar.c:161
+msgid "Ascending by year"
+msgstr "Растуће, по години"
+
+#: src/bar.c:162
+msgid "Descending by year"
+msgstr "Опадајуће, по години"
+
+#: src/bar.c:163
+msgid "Ascending by genre"
+msgstr "Растуће, по жанру"
+
+#: src/bar.c:164
+msgid "Descending by genre"
+msgstr "Опадајуће, по жанру"
+
+#: src/bar.c:165
+msgid "Ascending by comment"
+msgstr "Растуће, по коментару"
+
+#: src/bar.c:166
+msgid "Descending by comment"
+msgstr "Опадајуће, по коментару"
+
+#: src/bar.c:167
+msgid "Ascending by composer"
+msgstr "Растуће, по композитору"
+
+#: src/bar.c:168
+msgid "Descending by composer"
+msgstr "Опадајуће, по композитору"
+
+#: src/bar.c:169
+msgid "Ascending by original artist"
+msgstr "Растуће, по оригиналном извођачу"
+
+#: src/bar.c:170
+msgid "Descending by original artist"
+msgstr "Опадајуће, по оригиналном извођачу"
+
+#: src/bar.c:171
+msgid "Ascending by copyright"
+msgstr "Растуће, по ауторским правима"
+
+#: src/bar.c:172
+msgid "Descending by copyright"
+msgstr "Опадајуће, по ауторским правима"
+
+#: src/bar.c:173
+msgid "Ascending by URL"
+msgstr "Растуће, по УРЛ"
+
+#: src/bar.c:174
+msgid "Descending by URL"
+msgstr "Опадајуће, по УРЛ"
+
+#: src/bar.c:175
+msgid "Ascending by encoder name"
+msgstr "Растуће, по имену кодера"
+
+#: src/bar.c:176
+msgid "Descending by encoder name"
+msgstr "Опадајуће, по имену кодера"
+
+#: src/bar.c:177
+msgid "Ascending by file type"
+msgstr "Растуће, по типу датотеке"
+
+#: src/bar.c:178
+msgid "Descending by file type"
+msgstr "Опадајуће, по типу датотеке"
+
+#: src/bar.c:179
+msgid "Ascending by file size"
+msgstr "Растуће, по величини датотеке"
+
+#: src/bar.c:180
+msgid "Descending by file size"
+msgstr "Опадајуће, по величини датотеке"
+
+#: src/bar.c:181
+msgid "Ascending by duration"
+msgstr "Растуће, по дужини нумере"
+
+#: src/bar.c:182
+msgid "Descending by duration"
+msgstr "Опадајуће, по дужини нумере"
+
+#: src/bar.c:183
+msgid "Ascending by bitrate"
+msgstr "Растуће, по битском протоку"
+
+#: src/bar.c:184
+msgid "Descending by bitrate"
+msgstr "Опадајуће, по битском протоку"
+
+#: src/bar.c:185
+msgid "Ascending by samplerate"
+msgstr "Растуће по учестаности тока"
+
+#: src/bar.c:186
+msgid "Descending by samplerate"
+msgstr "Опадајуће, по учестаности тока"
+
+#: src/bar.c:188
+msgid "Open File(s) with ..."
+msgstr "Отвори датотеку(е) са..."
+
+#: src/bar.c:189 src/cddb.c:325
+msgid "Select All Files"
+msgstr "Изабери све датотеке"
+
+#: src/bar.c:190
+msgid "Unselect All Files"
+msgstr "Отпусти све датотеке"
+
+#: src/bar.c:191 src/cddb.c:332
+msgid "Invert Files Selection"
+msgstr "Обрнуто изабери датотеке"
+
+#: src/bar.c:192
+msgid "Delete File(s)"
+msgstr "Уклони датотеку(е)"
+
+#: src/bar.c:193
+msgid "_First File"
+msgstr "П_рва датотека"
+
+#: src/bar.c:193
+msgid "First File"
+msgstr "Прва датотека"
+
+#: src/bar.c:194
+msgid "_Previous File"
+msgstr "Пр_етходна датотека"
+
+#: src/bar.c:194
+msgid "Previous File"
+msgstr "Претходна датотека"
+
+#: src/bar.c:195
+msgid "_Next File"
+msgstr "_Наредна датотека"
+
+#: src/bar.c:195
+msgid "Next File"
+msgstr "Наредна датотека"
+
+#: src/bar.c:196
+msgid "_Last File"
+msgstr "По_следња датотека"
+
+#: src/bar.c:196
+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
+msgid "S_can File(s)"
+msgstr "С_кенирај датотеку(е)"
+
+#: src/bar.c:199
+msgid "Scan File(s)"
+msgstr "Скенирај датотеку(е)"
+
+#: src/bar.c:200
+msgid "_Remove Tag(s)"
+msgstr "_Уклони ознаку(е)"
+
+#: src/bar.c:200
+msgid "Remove Tag(s)"
+msgstr "Уклони ознаку(е)"
+
+#: src/bar.c:201
+msgid "_Undo Last File(s) Changes"
+msgstr "_Опозови последње измене датотеке(а)"
+
+#: src/bar.c:201
+msgid "Undo Last File(s) Changes"
+msgstr "Опозови последње измене датотеке(а)"
+
+#: src/bar.c:202
+msgid "R_edo Last File(s) Changes"
+msgstr "_Понови последње измене датотеке(а)"
+
+#: src/bar.c:202
+msgid "Redo Last File(s) Changes"
+msgstr "Понови последње измене датотеке(а)"
+
+#: src/bar.c:203
+msgid "_Save File(s)"
+msgstr "_Сачувај датотеку(е)"
+
+#: src/bar.c:203
+msgid "Save File(s)"
+msgstr "Сачувај датотеку(е)"
+
+#: src/bar.c:204
+msgid "_Force Saving File(s)"
+msgstr "При_морај чување датотеке(а)"
+
+#: src/bar.c:204
+msgid "Force Saving File(s)"
+msgstr "Приморај чување датотеке(а)"
+
+#: src/bar.c:205
+msgid "Undo Last Changes"
+msgstr "Опозови последње измене"
+
+#: src/bar.c:206
+msgid "Redo Last Changes"
+msgstr "Понови последње измене"
+
+#: src/bar.c:207
+msgid "_Quit"
+msgstr "_Изађи"
+
+#: src/bar.c:207
+msgid "Quit"
+msgstr "Изађи"
+
+#: src/bar.c:209
+msgid "_Browser"
+msgstr "П_регледач"
+
+#: src/bar.c:210
+msgid "Go to _Home Directory"
+msgstr "Иди у _лични директоријум"
+
+#: src/bar.c:210
+msgid "Go to Home Directory"
+msgstr "Иди у лични директоријум"
+
+#: src/bar.c:211
+msgid "Go to _Default Directory"
+msgstr "Иди у по_дразумевани директоријум"
+
+#: src/bar.c:211
+msgid "Go to Default Directory"
+msgstr "Иди у подразумевани директоријум"
+
+#: src/bar.c:212
+msgid "Set _Current Path as Default"
+msgstr "Постави _тренутну путању као подразумевану"
+
+#: src/bar.c:212
+msgid "Set Current Path as Default"
+msgstr "Постави тренутну путању као подразумевану"
+
+#: src/bar.c:213
+msgid "Tree View | Artist-Album View"
+msgstr "Преглед у стаблу | Преглед Извођач-Албум"
+
+#: src/bar.c:214
+msgid "Rename Directory ..."
+msgstr "Преименуј директоријум..."
+
+#: src/bar.c:215
+msgid "Reload Directory"
+msgstr "Освежи директоријум"
+
+#: src/bar.c:216 src/browser.c:3641
+msgid "Browse Directory with ..."
+msgstr "Отвори директоријум са..."
+
+#: src/bar.c:217
+msgid "_Collapse Tree"
+msgstr "_Сакупи стабло"
+
+#: src/bar.c:218
+msgid "_Refresh Tree"
+msgstr "_Освежи стабло"
+
+#: src/bar.c:220 src/bar.c:249
+msgid "S_canner"
+msgstr "С_кенер"
+
+#: src/bar.c:221
+msgid "_Fill Tag(s) ..."
+msgstr "_Испуни ознаку(е)"
+
+#: src/bar.c:221
+msgid "Fill Tag(s) ..."
+msgstr "Испуни ознаку(е)"
+
+#: src/bar.c:222
+msgid "_Rename File(s) and Directory ..."
+msgstr "П_реименуј датотеку(е) у директоријум..."
+
+#: src/bar.c:222
+msgid "Rename File(s) and Directory ..."
+msgstr "Преименуј датотеку(е) и директоријум"
+
+#: src/bar.c:223
+msgid "_Process Field(s) ..."
+msgstr "_Обради поље(а)..."
+
+#: src/bar.c:223
+msgid "Process Fields(s) ..."
+msgstr "Обради поље(а)..."
+
+#: src/bar.c:225
+msgid "_Misc"
+msgstr "_Остало"
+
+#: src/bar.c:226
+msgid "Search _File(s) ..."
+msgstr "_Тражи датотеку(е)..."
+
+#: src/bar.c:226
+msgid "Search File(s)..."
+msgstr "Тражи датотеку(е)..."
+
+#: src/bar.c:227
+msgid "CD Data _Base Search ..."
+msgstr "Претрага _базе ЦД података..."
+
+#: src/bar.c:227
+msgid "CDDB Search ..."
+msgstr "ЦД база, тражи..."
+
+#: src/bar.c:228
+msgid "Load Filenames from TXT ..."
+msgstr "Учитај имена датотека из .txt датотеке..."
+
+#: src/bar.c:229
+msgid "Write Playlist ..."
+msgstr "Начини листу нумера..."
+
+#: src/bar.c:230 src/bar.c:250 src/bar.c:251 src/bar.c:252
+msgid "Run Audio Player"
+msgstr "Покрени програм за репродукцију звука"
+
+#: src/bar.c:232
+msgid "_Settings"
+msgstr "Поде_шавања"
+
+#: src/bar.c:233
+msgid "_Preferences ..."
+msgstr "_Поставке..."
+
+#: src/bar.c:233
+msgid "Preferences ..."
+msgstr "Поставке..."
+
+#: src/bar.c:235
+msgid "_Help"
+msgstr "_Помоћ"
+
+#: src/bar.c:236
+msgid "_About"
+msgstr "_О програму"
+
+#.
+#. * Following items are on toolbar but not on menu
+#.
+#: src/bar.c:242
+msgid "Stop the current action"
+msgstr "Прекини тренутни задатак"
+
+#.
+#. * Popup menu's Actions
+#.
+#: src/bar.c:248
+msgid "_File Operations"
+msgstr "_Операције над датотекама"
+
+#: src/bar.c:253
+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:257
+msgid "Clean Log"
+msgstr "Очисти дневник измена"
+
+#. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
+#: src/bar.c:264
+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:267
+msgid "Show Hidden Directories"
+msgstr "Прикажи скривене директоријуме"
+
+#: src/bar.c:269
+msgid "Show tree browser / Display by Artist and Album"
+msgstr "Прикажи стабло датотека / Прикажи извођача и албум"
+
+#: src/bar.c:306
+#, c-format
+msgid "Could not merge UI, error was: %s\n"
+msgstr "Не могу да спојим UI, грешка: %s\n"
+
+#: src/bar.c:406
+msgid "Ready to start..."
+msgstr "Све је спремно за почетак..."
+
+#: src/browser.c:326
+msgid "New default path for files selected"
+msgstr "Изабрана је нова подразумевана путања за датотеке"
+
+#. Some files haven't been saved
+#. Some files aren't saved
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
+msgid "Confirm..."
+msgstr "Потврди..."
+
+#: src/browser.c:713
+msgid ""
+"Some files have been modified but not saved...\n"
+"Do you want to save them before changing the directory?"
+msgstr ""
+"Неке датотеке су измењене, али нису сачуване...\n"
+"Да ли желите да их сачувате пре промене директоријума?"
+
+#: src/browser.c:2040
+msgid "<All albums>"
+msgstr "<Сви албуми>"
+
+#: src/browser.c:2434
+#, c-format
+msgid "Error: Searching for %s, could not find node %s in tree."
+msgstr "Грешка: При тражењу %s, не могу да нађем чвор %s у стаблу."
+
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+msgid "Artist"
+msgstr "Извођач"
+
+#: src/browser.c:2801
+msgid "# Albums"
+msgstr "#Албуми"
+
+#: src/browser.c:2801 src/browser.c:2802
+msgid "# Files"
+msgstr "#Датотеке"
+
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
+msgid "Album"
+msgstr "Албум"
+
+#: src/browser.c:2822
+msgid "Go to parent directory"
+msgstr "Иди у родитељски директоријум"
+
+#: src/browser.c:2839
+msgid "Enter a directory to browse."
+msgstr "Унеси директоријум за претрагу."
+
+#: src/browser.c:2914
+msgid "Tree"
+msgstr "Стабло"
+
+#: src/browser.c:2957
+msgid "Artist & Album"
+msgstr "Извођач и албум"
+
+#: src/browser.c:3206
+msgid "Rename the directory"
+msgstr "Преименуј директоријум"
+
+#: src/browser.c:3222
+#, c-format
+msgid "Rename the directory '%s' to : "
+msgstr "Преименуј директоријум „%s“ у:"
+
+#: src/browser.c:3241 src/misc.c:1342
+msgid "Use mask :"
+msgstr "Користи маску:"
+
+#: src/browser.c:3244
+msgid "If activated, it will use masks to rename directory."
+msgstr "Уколик је активно, користиће маске за преименовање директоријума."
+
+#: src/browser.c:3263
+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:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
+msgid "Invalid Scanner Mask"
+msgstr "Неисправна маска скенера"
+
+#. Preview label
+#: src/browser.c:3289
+msgid "Rename directory preview..."
+msgstr "Преглед преименовања директоријума..."
+
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Грешка..."
+
+#: src/browser.c:3405
+msgid "You must type a directory name!"
+msgstr "Морате да унесете име директоријума!"
+
+#: src/browser.c:3420
+#, c-format
+msgid "Could not convert '%s' into filename encoding. Please use another name."
+msgstr ""
+"Не могу да преведем „%s“ у кодирање за име датотеке. Користите друго име."
+
+#. TODO
+#. // The same directory already exists. So we ask if we want to move the files
+#. msg = g_strdup_printf(_("The directory already exists!\n(%s)\nDo you want "
+#. "to move the files?"),new_path_utf8);
+#. msgbox = msg_box_new(_("Confirm..."),msg,GTK_STOCK_DIALOG_QUESTION,
+#. BUTTON_NO,BUTTON_YES,0);
+#. g_free(msg);
+#. msg_box_hide_check_button(MSG_BOX(msgbox));
+#. button = msg_box_run(MSG_BOX(msgbox));
+#. gtk_widget_destroy(msgbox);
+#.
+#. switch (button)
+#. {
+#. case BUTTON_YES:
+#. // Here we must rename all files with the new location, and remove the directory
+#.
+#. Rename_File ()
+#.
+#. break;
+#. case BUTTON_NO:
+#. break;
+#. }
+#: src/browser.c:3478
+#, c-format
+msgid ""
+"Can't rename because this directory name already exists!\n"
+"(%s)"
+msgstr ""
+"Не могу да преименујем јер директоријум са тим именом већ постоји!\n"
+"(%s)"
+
+#: src/browser.c:3513 src/browser.c:3539
+#, c-format
+msgid ""
+"Can't rename directory \n"
+"'%s'\n"
+" to \n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"Не могу да преименујем директоријум \n"
+"„%s“\n"
+" to \n"
+"„%s“!\n"
+"(%s)"
+
+#: src/browser.c:3582
+msgid "Directory renamed"
+msgstr "Директоријум преименован"
+
+#: src/browser.c:3660 src/browser.c:3820
+msgid "Program to run :"
+msgstr "Програм за покретање:"
+
+#: src/browser.c:3672
+msgid ""
+"Enter the program to run. It will receive the current directory as parameter."
+msgstr ""
+"Унесите програм за покретање. Он ће добити тренутни директоријум као "
+"параметар."
+
+#: src/browser.c:3801
+msgid "Open File with ..."
+msgstr "Отвори датотеку са..."
+
+#: src/browser.c:3832
+msgid ""
+"Enter the program to run. It will receive the current file as parameter."
+msgstr ""
+"Унесите програм за покретање. Он ће добити означену датотеку као параметар."
+
+#: src/browser.c:3985
+msgid "You must type a program name!"
+msgstr "Морате унети име програма!"
+
+#: src/browser.c:3998 src/misc.c:942
+#, c-format
+msgid "The program '%s' can't be found!"
+msgstr "Програм „%s“ није нађен!"
+
+#: src/browser.c:4047 src/misc.c:988
+#, c-format
+msgid "Can't execute %s (error %d)!\n"
+msgstr "Не могу да покренем %s (грешка %d)!\n"
+
+#: src/browser.c:4066 src/misc.c:1027
+msgid "Can't fork another process!\n"
+msgstr "Не могу да разгранам у још један процес!\n"
+
+#: src/browser.c:4100
+#, c-format
+msgid "Executed command : '%s %s'"
+msgstr "Извршена команда : „%s %s“"
+
+#: src/cddb.c:228
+msgid "Artist / Album"
+msgstr "Извођач / Албум"
+
+#: 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:229 src/cddb.c:438
+msgid "Track Name"
+msgstr "Наслов нумере"
+
+#: src/cddb.c:229
+msgid "Time"
+msgstr "Време"
+
+#: src/cddb.c:240
+msgid "CD Data Base Search"
+msgstr "Претрага базе ЦД података"
+
+#.
+#. * 1 - Page for automatic search (generate the CDDBId from files)
+#.
+#: src/cddb.c:272
+msgid "Automatic Search"
+msgstr "Аутоматска претрага"
+
+#: src/cddb.c:284
+msgid "Request CD database :"
+msgstr "Затражи ЦД базу :"
+
+#: 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:304 src/cddb.c:414
+msgid "Stop the search ..."
+msgstr "Прекини претрагу..."
+
+#. Check box to run the scanner
+#: src/cddb.c:311
+msgid "Use local Cddb"
+msgstr "Користи локалну ЦД базу"
+
+#: src/cddb.c:314 src/cddb.c:768
+msgid ""
+"When activating this option, after loading the fields, the current selected "
+"scanner will be ran (the scanner window must be opened)."
+msgstr ""
+"Након активирања ове опције, после учитавања поља, тренутно одабрани скенер "
+"ће бити покренут (прозор скенера мора бити отворен)."
+
+#.
+#. * 2 - Page for manual search
+#.
+#: src/cddb.c:359
+msgid "Manual Search"
+msgstr "Ручна претрага"
+
+#: src/cddb.c:374
+msgid "Words :"
+msgstr "Речи :"
+
+#: src/cddb.c:386
+msgid "Enter the words to search (separated by a space or '+')"
+msgstr "Унеси речи за претрагу (раздвојене размаком или знаком „+“)"
+
+#.
+#. * Search options
+#.
+#: src/cddb.c:426
+msgid "Search In :"
+msgstr "Тражи у :"
+
+#: src/cddb.c:434
+msgid "All Fields"
+msgstr "Сва поља"
+
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+msgid "Other"
+msgstr "Остало"
+
+#: src/cddb.c:461
+msgid "All Categories"
+msgstr "Све категорије"
+
+#: src/cddb.c:463
+msgid "Blues"
+msgstr "Блуз"
+
+#: src/cddb.c:464
+msgid "Classical"
+msgstr "Класика"
+
+#: src/cddb.c:465
+msgid "Country"
+msgstr "Кантри"
+
+#: src/cddb.c:466
+msgid "Folk"
+msgstr "Голк"
+
+#: src/cddb.c:467
+msgid "Jazz"
+msgstr "Џез"
+
+#.
+#. * Misc
+#.
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+msgid "Misc"
+msgstr "Остало"
+
+#: src/cddb.c:469
+msgid "Newage"
+msgstr "Нови талас"
+
+#: src/cddb.c:470
+msgid "Reggae"
+msgstr "Реге"
+
+#: src/cddb.c:471
+msgid "Rock"
+msgstr "Рок"
+
+#: src/cddb.c:472
+msgid "Soundtrack"
+msgstr "Звучна трака"
+
+#: src/cddb.c:509
+msgid "included : funk, soul, rap, pop, industrial, metal, etc."
+msgstr "укључује : фанк, соул, реп, поп, индастриал, метал,..."
+
+#: src/cddb.c:510
+msgid "movies, shows"
+msgstr "филмови, кабаре"
+
+#: src/cddb.c:511
+msgid "others that do not fit in the above categories"
+msgstr "остало што се не уклапа у горе наведене категорије"
+
+#. Button to display/hide the categories
+#: src/cddb.c:514
+msgid " Categories "
+msgstr "Категорије"
+
+#.
+#. * Results command
+#.
+#: src/cddb.c:522
+msgid "Results :"
+msgstr "Резултати :"
+
+#: src/cddb.c:529 src/misc.c:2012
+msgid "Search :"
+msgstr "Тражи :"
+
+#: src/cddb.c:542
+msgid "Enter the words to search in the list below"
+msgstr "Упишите кључне речи за претрагу у листи поред"
+
+#: src/cddb.c:554
+msgid "Search Next"
+msgstr "Тражи следеће"
+
+#: src/cddb.c:560
+msgid "Search Previous"
+msgstr "Тражи претходно"
+
+#: src/cddb.c:571
+msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
+msgstr ""
+"Прикажи само црвене редове (или прикажи све линије) у “извођач/албум“ листи"
+
+#: src/cddb.c:577 src/cddb.c:1503
+msgid "Unselect all lines"
+msgstr "Отпусти све редове"
+
+#: src/cddb.c:583
+msgid "Invert lines selection"
+msgstr "Обрнуто изабери редове"
+
+#: src/cddb.c:589 src/cddb.c:1498
+msgid "Select all lines"
+msgstr "Изабери све редове"
+
+#: src/cddb.c:702
+msgid ""
+"Select lines to 'apply' to your files list. All lines will be processed if "
+"no line is selected.\n"
+"You can also reorder lines in this list before using 'apply' button."
+msgstr ""
+"Изабери редове за упис у листу датотека. Сви редови ће бити уписане уколико "
+"ниједан није изабран.\n"
+"Такође можете преуредити редове у овој листи пре коришћења „Примени“ дугмета."
+
+#.
+#. * Apply results to fields...
+#.
+#: src/cddb.c:712
+msgid "Set Into :"
+msgstr "Унеси у :"
+
+#: src/cddb.c:719
+msgid "All"
+msgstr "Све"
+
+#: src/cddb.c:721 src/misc.c:1958
+msgid "File Name"
+msgstr "Име датотеке"
+
+#: src/cddb.c:722 src/misc.c:1959
+msgid "Title"
+msgstr "Наслов"
+
+#: src/cddb.c:725 src/misc.c:1963
+msgid "Year"
+msgstr "Година"
+
+#: src/cddb.c:726
+msgid "Track #"
+msgstr "Нумера #"
+
+#: src/cddb.c:727
+msgid "# Tracks"
+msgstr "# Нумере"
+
+#: src/cddb.c:728 src/misc.c:1965
+msgid "Genre"
+msgstr "Жанр"
+
+#. Check box to run the scanner
+#: src/cddb.c:765 src/misc.c:3013
+msgid "Run the current scanner for each file"
+msgstr "Примени текући скенер за сваку датотеку."
+
+#. Check box to use DLM (also used in the preferences window)
+#: src/cddb.c:772
+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:777 src/prefs.c:1362
+msgid ""
+"When activating this option, the Levenshtein algorithm (DLM : Damerau-"
+"Levenshtein Metric) will be used to match the CDDB title against every file "
+"name in the current folder, and to select the best match. This will be used "
+"when selecting the corresponding audio file, or applying cddb results, "
+"instead of using directly the position order."
+msgstr ""
+"Када активирате ову опцију, Левенштајнов алгоритам (DLM : Damerau-"
+"Levenshtein Metric) ће бити коришћен за поклапање имена нумере из ЦД базе са "
+"сваким именом датотеке у текућем директоријуму, бирајући најбоља поклапања. "
+"Ово ће бити коришћено када изаберете одговарајућу аудио датотеку или "
+"примените резултате из ЦД базе података, уместо да директно користи редослед."
+
+#: src/cddb.c:789
+msgid "Load the selected lines or all lines (if no line selected)."
+msgstr ""
+"Учитај изабране редове или све редове (уколико ни једна није изабрана)."
+
+#: src/cddb.c:798 src/misc.c:2255
+msgid "Ready to search..."
+msgstr "Спремно за претрагу..."
+
+#: src/cddb.c:1318
+#, c-format
+msgid ""
+"Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
+msgstr ""
+"Албум: '%s', извођач: '%s', дужина нумере: '%s', година: '%s', жанр: '%s', "
+"ИД: '%s'"
+
+#: src/cddb.c:1508
+msgid "Invert selection"
+msgstr "Изабери обратно"
+
+#: src/cddb.c:1516
+msgid "Sort by Track Number"
+msgstr "Сортирај по броју нумере"
+
+#: src/cddb.c:1521
+msgid "Sort by Track Name"
+msgstr "Сортирај по имену нумере"
+
+#: src/cddb.c:1619
+#, c-format
+msgid "Resolving host '%s' ..."
+msgstr "Приступам серверу „%s“ ..."
+
+#: src/cddb.c:1627
+#, c-format
+msgid "Can't resolve host '%s' (%s)!"
+msgstr "Не могу да приступим серверу „%s“ (%s)!"
+
+#: src/cddb.c:1642
+#, c-format
+msgid "Can't create a new socket (%s)!"
+msgstr "Не могу да направим нову утичницу (%s)!"
+
+#. Open connection to the server
+#: src/cddb.c:1656
+#, c-format
+msgid "Connecting to host '%s', port '%d' ..."
+msgstr "Повезивање на сервер „%s“, порт „%d“ ..."
+
+#: src/cddb.c:1663
+#, c-format
+msgid "Can't connect to host '%s' (%s)!"
+msgstr "Не могу да се повежем са сервером „%s“ (%s)!"
+
+#: src/cddb.c:1669
+#, c-format
+msgid "Connected to host '%s'"
+msgstr "Успостављена веза са сервером „%s“"
+
+#: src/cddb.c:1752
+#, c-format
+msgid "Receiving data (%s) ..."
+msgstr "Преносим податке (%s) ..."
+
+#: src/cddb.c:1764
+#, c-format
+msgid "Error when reading cddb response (%s)!"
+msgstr "Грешка при читању одговора из ЦД базе (%s)!"
+
+#: src/cddb.c:1770
+#, c-format
+msgid "Can't create file '%s' (%s)"
+msgstr "Не могу да направим датотеку „%s“ (%s)"
+
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#, c-format
+msgid "Can't open file '%s' (%s)"
+msgstr "Не могу да отворим датотеку „%s“ (%s)"
+
+#. g_print("Request : '%s'\n", cddb_in);
+#. Send the request
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
+msgid "Sending request ..."
+msgstr "Шаљем захтев ..."
+
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#, c-format
+msgid "Can't send the request (%s)!"
+msgstr "Не могу да пошаљем захтев (%s)!"
+
+#.
+#. * Read the answer
+#.
+#. Read the answer
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+msgid "Receiving data ..."
+msgstr "Примам податке ..."
+
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+msgid "The server returned a wrong answer!"
+msgstr "Сервер је вратио погрешан одговор!"
+
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#, c-format
+msgid "The server returned a wrong answer! (%s)"
+msgstr "Сервер је вратио погрешан одговор! (%s)"
+
+#: src/cddb.c:2440
+msgid "Sorry, the web-based search is currently down!"
+msgstr "Нажалост, веб базирана претрага је тренутно онеспособљена!"
+
+#: src/cddb.c:2442 src/cddb.c:2785
+#, c-format
+msgid "Found %d matching album(s)"
+msgstr "Нађен(о) %d албум(а) са поклапањем"
+
+#: src/cddb.c:2585
+#, c-format
+msgid "Receiving data of page %d (album %d/%d)..."
+msgstr "Примам податке странице %d (албум %d/%d)..."
+
+#: src/cddb.c:2587
+#, c-format
+msgid "Receiving data of page %d ..."
+msgstr "Примам податке странице %d ..."
+
+#: src/cddb.c:2752
+msgid "More results to load ..."
+msgstr "Још резултата да учитам..."
+
+#: src/cddb.c:2881
+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:2889
+msgid "More than 99 files selected! Can't send request!"
+msgstr "Више од 99 датотека је изабрано! Не могу да пошаљем захтев!"
+
+#: src/cddb.c:2895
+#, fuzzy, c-format
+msgid "%d file(s) selected!"
+msgstr "%d датотека изабрана"
+
+#: src/cddb.c:2970
+msgid "Local CD search..."
+msgstr "Локална претрага ЦД-а..."
+
+#: src/cddb.c:2971
+msgid ""
+"The path for 'Local CD Data Base' wasn't defined!\n"
+"Fill it in the preferences window."
+msgstr ""
+"Путања до „локалне ЦД базе“ није дефинисана!\n"
+"Унесите је у прозору са поставкама."
+
+#. g_print("Request : '%s'\n", cddb_in);
+#: src/cddb.c:3115
+#, c-format
+msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
+msgstr "Шаљем захтев (ЦД база: %s, #нумере: %d, дужина диска: %d) ..."
+
+#: src/cddb.c:3268
+#, c-format
+msgid "Found %d matching album(s) for DiscID '%s'"
+msgstr "Нађено %d албум(а) са поклапањем за диск ИД „%s“"
+
+#: src/cddb.c:3364
+#, c-format
+msgid "Can't load file: '%s' (%s)!"
+msgstr "Не могу да учитам датотеку: „%s“ (%s)!"
+
+#. Load the track list of the album
+#: src/cddb.c:3622
+msgid "Loading album track list ..."
+msgstr "Читам листу нумера албума..."
+
+#: src/cddb.c:3797
+#, c-format
+msgid ""
+"Be careful, you are applying %d lines of the CDDB results to %d lines in the "
+"list of files!\n"
+"\n"
+"Do you want to continue ?"
+msgstr ""
+"Будите опрезни, примењујете %d ред(а) из резултата ЦД базе на %d ред(а) у "
+"листи датотека!\n"
+"\n"
+"Да ли желите да наставите?"
+
+#: src/cddb.c:3800
+msgid "Write Tag from CDDB..."
+msgstr "Упиши ознаке из ЦД базе..."
+
+#: src/charset.c:49
+msgid "Arabic (IBM-864)"
+msgstr "Арапски (IBM-864)"
+
+#: src/charset.c:50
+msgid "Arabic (ISO-8859-6)"
+msgstr "Арапски (ISO-8859-6)"
+
+#: src/charset.c:51
+msgid "Arabic (Windows-1256)"
+msgstr "Арапски (Windows-1256)"
+
+#: src/charset.c:52
+msgid "Baltic (ISO-8859-13)"
+msgstr "Балтички (ISO-8859-13)"
+
+#: src/charset.c:53
+msgid "Baltic (ISO-8859-4)"
+msgstr "Балтички (ISO-8859-4)"
+
+#: src/charset.c:54
+msgid "Baltic (Windows-1257)"
+msgstr "Балтички (Windows-1257)"
+
+#: src/charset.c:55
+msgid "Celtic (ISO-8859-14)"
+msgstr "Келтски (ISO-8859-14)"
+
+#: src/charset.c:56
+msgid "Central European (IBM-852)"
+msgstr "Централно европски (IBM-852)"
+
+#: src/charset.c:57
+msgid "Central European (ISO-8859-2)"
+msgstr "Централно европски (ISO-8859-2)"
+
+#: src/charset.c:58
+msgid "Central European (Windows-1250)"
+msgstr "Централно европски (Windows-1250)"
+
+#: src/charset.c:59
+msgid "Chinese Simplified (GB18030)"
+msgstr "Упрошћени кинески (GB18030)"
+
+#: src/charset.c:60
+msgid "Chinese Simplified (GB2312)"
+msgstr "Упрошћени кинески (GB2312)"
+
+#: src/charset.c:61
+msgid "Chinese Traditional (Big5)"
+msgstr "Традиционални кинески (Big5)"
+
+#: src/charset.c:62
+msgid "Chinese Traditional (Big5-HKSCS)"
+msgstr "Традиционални кинески (Big5-HKSCS)"
+
+#: src/charset.c:63
+msgid "Cyrillic (IBM-855)"
+msgstr "Ћирилични (IBM-855)"
+
+#: src/charset.c:64
+msgid "Cyrillic (ISO-8859-5)"
+msgstr "Ћирилични (ISO-8859-5)"
+
+#: src/charset.c:65
+msgid "Cyrillic (ISO-IR-111)"
+msgstr "Ћирилични (ISO-IR-111)"
+
+#: src/charset.c:66
+msgid "Cyrillic (KOI8-R)"
+msgstr "Ћирилични (KOI8-R)"
+
+#: src/charset.c:67
+msgid "Cyrillic (Windows-1251)"
+msgstr "Ћирилични (Windows-1251)"
+
+#: src/charset.c:68
+msgid "Cyrillic/Russian (CP-866)"
+msgstr "Ћирилични/Руски (CP-866)"
+
+#: src/charset.c:69
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr "Ћирилични/Украински (KOI8-U)"
+
+#: src/charset.c:70
+msgid "English (US-ASCII)"
+msgstr "Енглески (US-ASCII)"
+
+#: src/charset.c:71
+msgid "Greek (ISO-8859-7)"
+msgstr "Грчки (ISO-8859-7)"
+
+#: src/charset.c:72
+msgid "Greek (Windows-1253)"
+msgstr "Грчки (Windows-1253)"
+
+#: src/charset.c:73
+msgid "Hebrew (IBM-862)"
+msgstr "Хебрејски (IBM-862)"
+
+#: src/charset.c:74
+msgid "Hebrew (Windows-1255)"
+msgstr "Хебрејски (Windows-1255)"
+
+#: src/charset.c:75
+msgid "Japanese (EUC-JP)"
+msgstr "Јапански (EUC-JP)"
+
+#: src/charset.c:76
+msgid "Japanese (ISO-2022-JP)"
+msgstr "Јапански (ISO-2022-JP)"
+
+#: src/charset.c:77
+msgid "Japanese (Shift_JIS)"
+msgstr "Јапански (Shift_JIS)"
+
+#: src/charset.c:78
+msgid "Korean (EUC-KR)"
+msgstr "Корејски (EUC-KR)"
+
+#: src/charset.c:79
+msgid "Nordic (ISO-8859-10)"
+msgstr "Нордијски (ISO-8859-10)"
+
+#: src/charset.c:80
+msgid "South European (ISO-8859-3)"
+msgstr "Јужно европски (ISO-8859-3)"
+
+#: src/charset.c:81
+msgid "Thai (TIS-620)"
+msgstr "Таи (TIS-620)"
+
+#: src/charset.c:82
+msgid "Turkish (IBM-857)"
+msgstr "Турски (IBM-857)"
+
+#: src/charset.c:83
+msgid "Turkish (ISO-8859-9)"
+msgstr "Турски (ISO-8859-9)"
+
+#: src/charset.c:84
+msgid "Turkish (Windows-1254)"
+msgstr "Турски (Windows-1254)"
+
+#. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
+#: src/charset.c:86
+msgid "Unicode (UTF-8)"
+msgstr "Уникод (UTF-8)"
+
+#. {N_("Unicode (UTF-16BE)"),                "UTF-16BE"      },
+#. {N_("Unicode (UTF-16LE)"),                "UTF-16LE"      },
+#. {N_("Unicode (UTF-32BE)"),                "UTF-32BE"      },
+#. {N_("Unicode (UTF-32LE)"),                "UTF-32LE"      },
+#: src/charset.c:93
+msgid "Vietnamese (VISCII)"
+msgstr "Вијетнамски (VISCII)"
+
+#: src/charset.c:94
+msgid "Vietnamese (Windows-1258)"
+msgstr "Вијетнамски (Windows-1258)"
+
+#: src/charset.c:95
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr "Визуелни хебрејски (ISO-8859-8)"
+
+#: src/charset.c:96
+msgid "Western (IBM-850)"
+msgstr "Западњачки (IBM-850)"
+
+#: src/charset.c:97
+msgid "Western (ISO-8859-1)"
+msgstr "Западњачки (ISO-8859-1)"
+
+#: src/charset.c:98
+msgid "Western (ISO-8859-15)"
+msgstr "Западњачки (ISO-8859-15)"
+
+#: src/charset.c:99
+msgid "Western (Windows-1252)"
+msgstr "Западњачки (Windows-1252)"
+
+#: src/charset.c:542
+#, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+msgstr "Име датотеке „%s“ не може бити преведено у UTF-8 (%s).\n"
+
+#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+msgid "Invalid UTF-8"
+msgstr "Неисправан UTF-8"
+
+#: src/charset.c:641
+#, c-format
+msgid ""
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+msgstr ""
+"UTF-8 карактер „%s“ не може бити преведен у кодирање (%s) за име датотеке\n"
+
+#: src/charset.c:705
+#, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+msgstr "Карактер „%s“ не може бити преведен у UTF-8 (%s).\n"
+
+#. Starting messages
+#: src/easytag.c:177
+#, c-format
+msgid "Starting EasyTAG %s (PId: %d) ..."
+msgstr "Покрећем EasyTAG %s (PId: %d) ..."
+
+#: src/easytag.c:179
+#, c-format
+msgid "Currently using libid3tag version %s ..."
+msgstr "Користим libid3tag верзије %s ..."
+
+#: src/easytag.c:182
+#, c-format
+msgid "Currently using id3lib version %d.%d.%d ..."
+msgstr "Користим id3lib верзије %d.%d.%d ..."
+
+#: src/easytag.c:189
+#, c-format
+msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
+msgstr "Промењљива EASYTAGLANG дефинисана. Постављам локализацију: „%s“"
+
+#: src/easytag.c:191
+#, c-format
+msgid "Setting locale : '%s'"
+msgstr "Постављам локализацију: „%s“"
+
+#: src/easytag.c:195
+#, c-format
+msgid "Currently using locale '%s' (and eventually '%s')..."
+msgstr "Тренутно користим локализацију „%s„ (и евентуално „%s“)..."
+
+#: src/easytag.c:211
+#, c-format
+msgid "%s %s by %s (compiled %s, %s)\n"
+msgstr "%s %s од %s (преведен %s, %s)\n"
+
+#: src/easytag.c:213
+#, c-format
+msgid "Web Page: %s"
+msgstr "Интернет презентација: %s"
+
+#: src/easytag.c:288
+#, c-format
+msgid "Unknown parameter or path '%s'\n"
+msgstr "Непознати параметар у стази „%s“\n"
+
+#.
+#. * Browser
+#.
+#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+msgid "Browser"
+msgstr "Прегледач"
+
+#: src/easytag.c:424 src/et_core.c:2605
+msgid "File"
+msgstr "Датотека"
+
+#: src/easytag.c:450
+msgid "Read Only File"
+msgstr "Неизмењљива датотека"
+
+#: src/easytag.c:453
+msgid "File Link Broken"
+msgstr "Веза са датотеком прекинута"
+
+#. Default values are MPs data
+#. MPEG, Layer versions
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+msgid "MPEG"
+msgstr "MPEG"
+
+#: src/easytag.c:469 src/easytag.c:4067
+msgid "?, Layer ?"
+msgstr "?. Слој ?"
+
+#: src/easytag.c:474
+msgid "Bitrate:"
+msgstr "Битски проток:"
+
+#: src/easytag.c:476 src/easytag.c:4068
+msgid "? kb/s"
+msgstr "? kb/s"
+
+#: src/easytag.c:481
+msgid "Freq:"
+msgstr "Учестаност:"
+
+#: src/easytag.c:483 src/easytag.c:4069
+msgid "? Hz"
+msgstr "? Hz"
+
+#. Mode
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+msgid "Mode:"
+msgstr "Мод:"
+
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
+msgid "?"
+msgstr "?"
+
+#: src/easytag.c:498
+msgid "Size:"
+msgstr "Величина:"
+
+#: src/easytag.c:500
+msgid "? kb"
+msgstr "? kb"
+
+#: src/easytag.c:505
+msgid "Time:"
+msgstr "Време:"
+
+#. Main Frame
+#: src/easytag.c:551 src/et_core.c:2543
+msgid "Tag"
+msgstr "Ознака"
+
+#.
+#. * 1 - Page for common tag fields
+#.
+#: src/easytag.c:573
+msgid "Common"
+msgstr "Честа поља"
+
+#. Title
+#: src/easytag.c:585
+msgid "Title:"
+msgstr "Наслов:"
+
+#: src/easytag.c:598
+msgid "Tag selected files with this title"
+msgstr "Додај ознаку наслов обележеним датотекама"
+
+#. Artist
+#: src/easytag.c:605
+msgid "Artist:"
+msgstr "Извођач:"
+
+#: src/easytag.c:617
+msgid "Tag selected files with this artist"
+msgstr "Додај ознаку извођач обележеним датотекама"
+
+#. Album
+#: src/easytag.c:623
+msgid "Album:"
+msgstr "Албум:"
+
+#: src/easytag.c:636
+msgid "Tag selected files with this album name"
+msgstr "Додај ознаку албум обележеним датотекама"
+
+#. Disc Number
+#: src/easytag.c:642
+msgid "CD:"
+msgstr "ЦД:"
+
+#: src/easytag.c:658
+msgid "Tag selected files with this disc number"
+msgstr "Додај ознаку број ЦД-а обележеним датотекама"
+
+#. Year
+#: src/easytag.c:664
+msgid "Year:"
+msgstr "Година:"
+
+#: src/easytag.c:681
+msgid "Tag selected files with this year"
+msgstr "Додај ознаку година обележеним датотекама"
+
+#: src/easytag.c:693
+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:702
+msgid "Track #:"
+msgstr "Нумера #:"
+
+#: src/easytag.c:728
+msgid ""
+"Set the number of files, in the same directory of the displayed file, to the "
+"selected tracks."
+msgstr ""
+"Унеси број датотека, у истом директоријуму као и приказана датотека, да би "
+"изабрао нумере."
+
+#: src/easytag.c:747
+msgid "Tag selected files with this number of tracks"
+msgstr "Додај ознаку број нумера обележеним датотекама"
+
+#. Genre
+#: src/easytag.c:753
+msgid "Genre:"
+msgstr "Жанр:"
+
+#: src/easytag.c:778
+msgid "Tag selected files with this genre"
+msgstr "Додај ознаку жанр обележеним датотекама"
+
+#. Comment
+#: src/easytag.c:784
+msgid "Comment:"
+msgstr "Коментар:"
+
+#: src/easytag.c:809
+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:818
+msgid "Composer:"
+msgstr "Композитор:"
+
+#: src/easytag.c:830
+msgid "Tag selected files with this composer"
+msgstr "Додај ознаку композитор обележеним датотекама"
+
+#. Original Artist / Performer
+#: src/easytag.c:837
+msgid "Orig. Artist:"
+msgstr "Ориг. извођач:"
+
+#: src/easytag.c:849
+msgid "Tag selected files with this original artist"
+msgstr "Додај ознаку оригинални извођач обележеним датотекама"
+
+#. Copyright
+#: src/easytag.c:856
+msgid "Copyright:"
+msgstr "Ауторско право:"
+
+#: src/easytag.c:868
+msgid "Tag selected files with this copyright"
+msgstr "Додај ознаку ауторско право обележеним датотекама"
+
+#. URL
+#: src/easytag.c:875
+msgid "URL:"
+msgstr "УРЛ:"
+
+#: src/easytag.c:887
+msgid "Tag selected files with this URL"
+msgstr "Додај ознаку УРЛ обележеним датотекама"
+
+#. Encoded by
+#: src/easytag.c:894
+msgid "Encoded by:"
+msgstr "Кодирано помоћу:"
+
+#: src/easytag.c:906
+msgid "Tag selected files with this encoder name"
+msgstr "Додај ознаку за програм којим су кодиране обележене датотекама"
+
+#.
+#. * 2 - Page for extra tag fields
+#.
+#: src/easytag.c:966
+msgid "Pictures"
+msgstr "Слике"
+
+#. Picture
+#: src/easytag.c:977
+msgid "Pictures:"
+msgstr "Слике:"
+
+#: src/easytag.c:997
+msgid "You can use drag and drop to add picture."
+msgstr "Можете превући слике у овај дијалог да би их додали."
+
+#: src/easytag.c:1035
+msgid "Tag selected files with these pictures"
+msgstr "Додај слике обележеним датотекама"
+
+#: src/easytag.c:1045
+msgid "Add pictures to the tag (drag and drop is also available)."
+msgstr "Додај слике у ознаку (превлачење је такође доступно)."
+
+#: src/easytag.c:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "Уклони изабране слике, у супротном све слике."
+
+#: src/easytag.c:1061
+msgid "Save the selected pictures on the hard disk."
+msgstr "Сачувај изабране слике на тврди диск."
+
+#: src/easytag.c:1068
+msgid "Set properties of the selected pictures."
+msgstr "Постави атрибуте изабраних слика."
+
+#: src/easytag.c:1148
+#, c-format
+msgid "Selected files tagged with title '%s'."
+msgstr "Изабране датотеке означене насловом „%s“."
+
+#: src/easytag.c:1150
+msgid "Removed title from selected files."
+msgstr "Уклоњен наслов из изабраних датотека."
+
+#: src/easytag.c:1167
+#, c-format
+msgid "Selected files tagged with artist '%s'."
+msgstr "Изабране датотеке означене извођачем „%s“."
+
+#: src/easytag.c:1169
+msgid "Removed artist from selected files."
+msgstr "Уклоњен извођача из изабраних датотека."
+
+#: src/easytag.c:1186
+#, c-format
+msgid "Selected files tagged with album '%s'."
+msgstr "Изабране датотеке означене албумом „%s“."
+
+#: src/easytag.c:1188
+msgid "Removed album name from selected files."
+msgstr "Уклоњено име албума из изабраних датотека."
+
+#: src/easytag.c:1205
+#, c-format
+msgid "Selected files tagged with disc number '%s'."
+msgstr "Изабране датотеке означене бројем диска „%s“."
+
+#: src/easytag.c:1207
+msgid "Removed disc number from selected files."
+msgstr "Уклоњен број диска из изабраних датотека."
+
+#: src/easytag.c:1224
+#, c-format
+msgid "Selected files tagged with year '%s'."
+msgstr "Изабране датотеке означене годином „%s“."
+
+#: src/easytag.c:1226
+msgid "Removed year from selected files."
+msgstr "Уклоњена година из изабраних датотека."
+
+#: src/easytag.c:1254 src/easytag.c:1350
+#, c-format
+msgid "Selected files tagged with track like 'xx/%s'."
+msgstr "Изабране датотеке означене називом типа „xx/%s“."
+
+#: src/easytag.c:1257
+msgid "Selected files tagged with track like 'xx'."
+msgstr "Изабране датотеке означене називом типа „xx“."
+
+#: src/easytag.c:1261 src/easytag.c:1353
+msgid "Removed track number from selected files."
+msgstr "Уклоњен број нумере из изабраних датотека."
+
+#. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
+#: src/easytag.c:1319
+msgid "Selected tracks numbered sequentially."
+msgstr "Изабране датотеке побројане редом."
+
+#: src/easytag.c:1371
+#, c-format
+msgid "Selected files tagged with genre '%s'."
+msgstr "Изабране датотеке означене жанром „%s“."
+
+#: src/easytag.c:1373
+msgid "Removed genre from selected files."
+msgstr "Уклоњен жанр из изабраних датотека."
+
+#: src/easytag.c:1397
+#, c-format
+msgid "Selected files tagged with comment '%s'."
+msgstr "Изабране датотеке означене коментаром „%s“."
+
+#: src/easytag.c:1399
+msgid "Removed comment from selected files."
+msgstr "Уклоњен коментар из изабраних датотека."
+
+#: src/easytag.c:1416
+#, c-format
+msgid "Selected files tagged with composer '%s'."
+msgstr "Изабране датотеке означене композитором „%s“."
+
+#: src/easytag.c:1418
+msgid "Removed composer from selected files."
+msgstr "Уклоњен композитор из изабраних датотека."
+
+#: src/easytag.c:1435
+#, c-format
+msgid "Selected files tagged with original artist '%s'."
+msgstr "Изабране датотеке означене са оригиналним извођачем „%s“."
+
+#: src/easytag.c:1437
+msgid "Removed original artist from selected files."
+msgstr "Уклоњен оригинални извођач из изабраних датотека."
+
+#: src/easytag.c:1454
+#, c-format
+msgid "Selected files tagged with copyright '%s'."
+msgstr "Изабране датотеке означене ауторским правом „%s“."
+
+#: src/easytag.c:1456
+msgid "Removed copyright from selected files."
+msgstr "Уклоњено ауторско право из изабраних датотека."
+
+#: src/easytag.c:1473
+#, c-format
+msgid "Selected files tagged with URL '%s'."
+msgstr "Изабране датотеке означене УРЛ-ом „%s“."
+
+#: src/easytag.c:1475
+msgid "Removed URL from selected files."
+msgstr "Уклоњен УРЛ из изабраних датотека."
+
+#: src/easytag.c:1492
+#, c-format
+msgid "Selected files tagged with encoder name '%s'."
+msgstr "Изабране датотеке означене са именом кодера „%s“."
+
+#: src/easytag.c:1494
+msgid "Removed encoder name from selected files."
+msgstr "Уклоњено име кодера из изабраних датотека."
+
+#: src/easytag.c:1529
+msgid "Selected files tagged with pictures."
+msgstr "Изабране датотеке означене сликама."
+
+#: src/easytag.c:1531
+msgid "Removed pictures from selected files."
+msgstr "Уклоњене слике из изабраних датотека."
+
+#: src/easytag.c:1770
+msgid "Select Mode and Mask, and redo the same action"
+msgstr "Изабрани мод и маска, и понови су исте команде."
+
+#: src/easytag.c:1825
+msgid "All tags have been scanned"
+msgstr "Све ознаке су скениране"
+
+#: src/easytag.c:1882
+msgid "All tags have been removed"
+msgstr "Све ознаке су уклоњене"
+
+#: src/easytag.c:2177 src/easytag.c:2200
+msgid "All files have been saved..."
+msgstr "Све датотеке су сачуване..."
+
+#: src/easytag.c:2198
+msgid "Files have been partially saved..."
+msgstr "Датотеке су половично сачуване..."
+
+#: src/easytag.c:2348
+msgid "Files have been partially deleted..."
+msgstr "Датотеке су половично уклоњене..."
+
+#: src/easytag.c:2350
+msgid "All files have been deleted..."
+msgstr "Све датотеке су уклоњене..."
+
+#: src/easytag.c:2422
+#, c-format
+msgid ""
+"Do you want to write the tag of file\n"
+"'%s' ?"
+msgstr ""
+"Да ли желите да упишете ознаку датотеке\n"
+"„%s“ ?"
+
+#: src/easytag.c:2426 src/easytag.c:2431
+msgid "Write Tag..."
+msgstr "Упиши ознаку..."
+
+#. Directories and filename changed
+#: src/easytag.c:2488
+msgid "Rename File and Directory..."
+msgstr "Преименуј датотеку и директоријум..."
+
+#: src/easytag.c:2489
+#, c-format
+msgid ""
+"Do you want to rename the file and directory \n"
+"'%s'\n"
+"to \n"
+"'%s' ?"
+msgstr ""
+"Желите ли да преименујете датотеку и директоријум\n"
+"„%s“\n"
+"у \n"
+"„%s“ ?"
+
+#. Only directories changed
+#: src/easytag.c:2494
+msgid "Rename Directory..."
+msgstr "Преименуј директоријум..."
+
+#: src/easytag.c:2495
+#, c-format
+msgid ""
+"Do you want to rename the directory \n"
+"'%s'\n"
+"to \n"
+"'%s' ?"
+msgstr ""
+"Желите ли да преименујете директоријум \n"
+"„%s“\n"
+"у \n"
+"„%s“ ?"
+
+#. Only filename changed
+#: src/easytag.c:2501
+msgid "Rename File..."
+msgstr "Преименуј датотеку..."
+
+#: src/easytag.c:2502
+#, c-format
+msgid ""
+"Do you want to rename the file \n"
+"'%s'\n"
+"to \n"
+"'%s' ?"
+msgstr ""
+"Желите ли да преименујете датотеку \n"
+"„%s“\n"
+"у \n"
+"„%s“ ?"
+
+#: src/easytag.c:2571
+#, c-format
+msgid "Writing tag of '%s'"
+msgstr "Уписивање ознаке од „%s“"
+
+#: src/easytag.c:2577
+msgid "Tag(s) written"
+msgstr "Ознака(е) уписане"
+
+#. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
+#: src/easytag.c:2586 src/easytag.c:2591
+#, c-format
+msgid ""
+"Can't write tag in file '%s'!\n"
+"(%s)"
+msgstr ""
+"Не могу да упишем ознаку у датотеку „%s“!\n"
+"(%s)"
+
+#: src/easytag.c:2717
+#, 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:2737 src/easytag.c:2769 src/easytag.c:2941
+#, c-format
+msgid ""
+"Can't rename file '%s'\n"
+" to \n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"Не могу да преименујем датотеку „%s“\n"
+" у \n"
+"„%s“!\n"
+"(%s)"
+
+#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+msgid "File(s) not renamed..."
+msgstr "Датотека(е) нису преименоване..."
+
+#: src/easytag.c:2784
+#, c-format
+msgid ""
+"Can't rename file \n"
+"'%s'\n"
+"because the following file already exists:\n"
+"'%s'"
+msgstr ""
+"Не могу да преименујем датотеку \n"
+"„%s“\n"
+"јер следећа већ постоји:\n"
+"„%s“"
+
+#: src/easytag.c:2816
+#, c-format
+msgid ""
+"Can't create target directory\n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"Не могу да направим директоријум\n"
+"„%s“!\n"
+"(%s)"
+
+#. Renaming file has succeeded
+#: src/easytag.c:2838
+#, c-format
+msgid "Renamed file '%s' to '%s'"
+msgstr "Преименована датотека „%s“ у „%s“"
+
+#: src/easytag.c:2844
+msgid "File(s) renamed..."
+msgstr "Датотека(е) преименоване..."
+
+#: src/easytag.c:2854 src/easytag.c:2901
+#, c-format
+msgid ""
+"Can't remove old directory\n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"Не могу да уклоним стари директоријум\n"
+"„%s“!\n"
+"(%s)"
+
+#. Renaming file has succeeded
+#: src/easytag.c:2885
+#, c-format
+msgid "Moved file '%s' to '%s'"
+msgstr "Премештена датотека „%s“ to „%s“"
+
+#: src/easytag.c:2891
+msgid "File(s) moved..."
+msgstr "Датотека(е) премештене..."
+
+#. Moving file has failed
+#: src/easytag.c:2923
+#, c-format
+msgid ""
+"Can't move file '%s'\n"
+" to \n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"Не могу да преместим датотеку „%s“\n"
+" to \n"
+"„%s“!\n"
+"(%s)"
+
+#: src/easytag.c:2931
+msgid "File(s) not moved..."
+msgstr "Датотека(е) нисо премештене..."
+
+#: src/easytag.c:2983
+#, c-format
+msgid ""
+"Do you really want to delete definitively the file\n"
+"'%s' ?"
+msgstr ""
+"Да ли заиста желите да уклоните датотеку\n"
+"„%s“ ?"
+
+#: src/easytag.c:2986 src/easytag.c:2990
+msgid "Delete File..."
+msgstr "Уклони датотеку..."
+
+#: src/easytag.c:3012
+#, c-format
+msgid "File '%s' deleted"
+msgstr "Датотека „%s“ уклођена"
+
+#: src/easytag.c:3147
+#, c-format
+msgid ""
+"Can't read directory :\n"
+"'%s'\n"
+"(%s)"
+msgstr ""
+"Не могу да читам директоријум:\n"
+"„%s“\n"
+"(%s)"
+
+#. Read the directory recursively
+#: src/easytag.c:3170
+msgid "Search in progress..."
+msgstr "Претрага у току..."
+
+#: src/easytag.c:3187 src/et_core.c:2612
+#, c-format
+msgid "File: '%s'"
+msgstr "Датотека: „%s“"
+
+#: src/easytag.c:3237
+#, c-format
+msgid "Found %d file(s) in this directory and subdirectories."
+msgstr "Нађено %d датотека(е) у овом директоријуму и под-директоријумима."
+
+#: src/easytag.c:3239
+#, c-format
+msgid "Found %d file(s) in this directory."
+msgstr "Нађено %d датотека(е) у овом директоријуму."
+
+#. And refresh the number of files in this directory
+#: src/easytag.c:3252 src/et_core.c:2696
+#, c-format
+msgid "%u file(s)"
+msgstr "%u датотека(е)"
+
+#: src/easytag.c:3258
+msgid "No file found in this directory and subdirectories!"
+msgstr ""
+"Ни једна датотека није пронађена у овом директоријуму и под-директоријумима!"
+
+#: src/easytag.c:3260
+msgid "No file found in this directory!"
+msgstr "Ни једна датотека није пронађена у овом директоријуму!"
+
+#: src/easytag.c:3348
+msgid "Searching..."
+msgstr "Тражим..."
+
+#. Button to stop...
+#: src/easytag.c:3368
+msgid "  STOP the search...  "
+msgstr "Прекини претрагу..."
+
+#. Open the last selected scanner
+#: src/easytag.c:4093
+msgid "Select a directory to browse!"
+msgstr "Изабери директоријум за преглед!"
+
+#. Menu items
+#: src/easytag.c:4229
+msgid "Tag selected files with this field"
+msgstr "Означи изабране датотеке овим пољем"
+
+#: src/easytag.c:4240
+msgid "Convert '_' and '%20' to spaces"
+msgstr "Преведи „_“ и „%20“ у размак"
+
+#: src/easytag.c:4247 src/scan.c:2245
+msgid "Convert ' ' to '_'"
+msgstr "Преведи „ “ у „_“"
+
+#. Group: capitalize, ...
+#: src/easytag.c:4258 src/scan.c:2294
+msgid "All uppercase"
+msgstr "Сва слова велика"
+
+#: src/easytag.c:4265 src/scan.c:2295
+msgid "All downcase"
+msgstr "Сва слова мала"
+
+#: src/easytag.c:4272 src/scan.c:2296
+msgid "First letter uppercase"
+msgstr "Прво слово велико"
+
+#: src/easytag.c:4279 src/scan.c:2297
+msgid "First letter uppercase of each word"
+msgstr "Прво слово сваке речи велико"
+
+#. Group: insert/remove spaces
+#: src/easytag.c:4290 src/scan.c:2336
+msgid "Remove spaces"
+msgstr "Уклони размаке"
+
+#: src/easytag.c:4297
+msgid "Insert space before uppercase letter"
+msgstr "Убаци размак пре велико слова"
+
+#: src/easytag.c:4304
+msgid "Remove duplicate spaces or underscores"
+msgstr "Уклони дупле размаке или доње цртице"
+
+#. gchar commmand[256];
+#. To send messages to the console...
+#: src/easytag.c:4324 src/easytag.c:4332
+#, c-format
+msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
+msgstr "EasyTAG %s: Ненормално изашао! (ПИД: %d)."
+
+#: src/easytag.c:4325 src/easytag.c:4334
+#, c-format
+msgid "Received signal %s (%d)\a"
+msgstr "Добијен сигнал %s (%d)\a"
+
+#: src/easytag.c:4327 src/easytag.c:4336
+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@gmail.com"
+msgstr ""
+"Вероватно сте нашли грешку у програму EasyTAG. Молимо вас, пошаљите нам "
+"извештај грешке са gdb повратни ход („gdb easytag core“ затим „bt“ и „l“) и "
+"информацијама како се грешка може изазвати на easytag@gmail.com"
+
+#: src/easytag.c:4463
+msgid "Unknown signal"
+msgstr "Непознат сигнал"
+
+#: src/easytag.c:4479
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage: easytag [option] \n"
+"   or: easytag [directory]\n"
+"\n"
+"Option:\n"
+"-------\n"
+"-h, --help        Display this text and exit.\n"
+"-v, --version     Print basic informations and exit.\n"
+"\n"
+"Directory:\n"
+"----------\n"
+"%s/path_to/files  Use an absolute path to load,\n"
+"path_to/files     Use a relative path.\n"
+"\n"
+msgstr ""
+"\n"
+"Коришћење: easytag [опције] \n"
+"   или: easytag [директоријум]\n"
+"\n"
+"Опције:\n"
+"-------\n"
+"-h, --help        Прикажи ову поруку и изађи.\n"
+"-v, --version     Прикажи основне информације и изађи.\n"
+"\n"
+"Директоријум:\n"
+"----------\n"
+"c:/путања_до/датотека  Користи апсолутну путању за учитавање,\n"
+"/путања_до/датотека    Користи апсолутну путању за учитавање,\n"
+"путања_до/датотека     Користи релативну путању.\n"
+"\n"
+
+#: src/easytag.c:4507
+msgid "EasyTAG: Normal exit."
+msgstr "EasyTAG: Нормалан излаз."
+
+#: src/easytag.c:4550 src/easytag.c:4589
+msgid ""
+"Some files have been modified but not saved...\n"
+"Do you want to save them before exiting the program?"
+msgstr ""
+"Неке датотеке су измењене али нису сачуване...\n"
+"Желите ли да их сачувате пре изласка из програма?"
+
+#: src/easytag.c:4570
+msgid " Do you really want to exit the program? "
+msgstr "Да ли заиста желите да изађете из програма?"
+
+#: src/et_core.c:2509
+msgid "ID3 Tag"
+msgstr "ID3 ознака"
+
+#: src/et_core.c:2515
+msgid "Ogg Vorbis Tag"
+msgstr "Ogg Vorbis ознака"
+
+#: src/et_core.c:2521
+msgid "FLAC Vorbis Tag"
+msgstr "FLAC Vorbis ознака"
+
+#: src/et_core.c:2526
+msgid "APE Tag"
+msgstr "APE ознака"
+
+#: src/et_core.c:2531
+msgid "MP4/M4A/AAC Tag"
+msgstr "MP4/M4A/AAC ознака"
+
+#: src/et_core.c:2537
+msgid "Wavpack Tag"
+msgstr "Wavpack ознака"
+
+#: src/et_core.c:2557
+msgid "MP3 File"
+msgstr "MP3 датотека"
+
+#: src/et_core.c:2561
+msgid "MP2 File"
+msgstr "MP2 даотека"
+
+#: src/et_core.c:2567
+msgid "Ogg Vorbis File"
+msgstr "Ogg Vorbis датотека"
+
+#: src/et_core.c:2573
+msgid "Speex File"
+msgstr "Speex датотека"
+
+#: src/et_core.c:2579
+msgid "FLAC File"
+msgstr "FLAC датотека"
+
+#: src/et_core.c:2584
+msgid "MusePack File"
+msgstr "MusePack датотека"
+
+#: src/et_core.c:2588
+msgid "Monkey's Audio File"
+msgstr "Monkey аудио датотека"
+
+#: src/et_core.c:2593
+msgid "MP4/AAC File"
+msgstr "MP4/AAC датотека"
+
+#: src/et_core.c:2599
+msgid "Wavpack File"
+msgstr "Wavpack датеотека"
+
+#: src/et_core.c:2873
+#, c-format
+msgid "Pictures (%d)"
+msgstr "Слике (%d)"
+
+#. Bitrate
+#: src/et_core.c:2912 src/flac_header.c:299 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
+msgid "%d kb/s"
+msgstr "%d kb/s"
+
+#. Samplerate
+#: src/et_core.c:2917 src/flac_header.c:304 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:3057
+#, c-format
+msgid ""
+"Could not convert filename : '%s'\n"
+"into system filename encoding\n"
+"(Try setting the environment variable G_FILENAME_ENCODING)."
+msgstr ""
+"Не могу да преведем име датотеке : „%s“\n"
+"у кодирање потребно за систем датотека\n"
+"(Покушајте да наместите променљиву G_FILENAME_ENCODING)."
+
+#: src/et_core.c:3060 src/scan.c:664
+msgid "Filename translation"
+msgstr "Преводи имена датотеке"
+
+#: src/et_core.c:4536 src/et_core.c:4544
+#, c-format
+msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
+msgstr "Име датотеке „%s“ премашује %d карактера и биће скраћено!\n"
+
+#. Nothing to display
+#. gtk_label_set_text(GTK_LABEL(VersionLabel),"");
+#. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
+#. Version changed to encoder version
+#. Encoder version
+#: src/flac_header.c:295 src/monkeyaudio_header.c:96 src/musepack_header.c:98
+#: src/ogg_header.c:245 src/wavpack_header.c:72
+msgid "Encoder:"
+msgstr "Кодер:"
+
+#. Mode
+#. Mode
+#. mpeg4ip library seems to always return -1
+#. Mode
+#: src/flac_header.c:309 src/mp4_header.c:286 src/ogg_header.c:267
+#: src/wavpack_header.c:88
+msgid "Channels:"
+msgstr "Канала:"
+
+#: src/flac_tag.c:140 src/flac_tag.c:741
+#, c-format
+msgid "ERROR while opening file: '%s' as FLAC (%s)."
+msgstr "Грешка при отварању датотеке: „%s“ као FLAC (%s)."
+
+#: src/flac_tag.c:983 src/ogg_tag.c:752
+#, c-format
+msgid "ERROR: Failed to write comments to file '%s' (%s)."
+msgstr "Грешка: неуспео упис коментара у датотеку „%s“ (%s)."
+
+#: src/flac_tag.c:990 src/ogg_tag.c:759
+#, c-format
+msgid "Written tag of '%s'"
+msgstr "Уписана ознаку у „%s“"
+
+#: src/id3_tag.c:484
+#, c-format
+msgid "Removed tag of '%s'"
+msgstr "Уклоњена ознака из „%s“"
+
+#: src/id3_tag.c:488 src/id3_tag.c:585
+#, c-format
+msgid "Error while removing ID3v1 tag of '%s' (%s)"
+msgstr "Грешка при уклањању ID3v1 ознаке из „%s“ (%s)"
+
+#: src/id3_tag.c:490 src/id3_tag.c:557
+#, c-format
+msgid "Error while removing ID3v2 tag of '%s' (%s)"
+msgstr "Грешка при уклањању ID3v2 ознаке из „%s“ (%s)"
+
+#: src/id3_tag.c:509
+#, c-format
+msgid "Error while updating ID3v2 tag of '%s' (%s)"
+msgstr "Грешка при промени ID3v2 ознаке у „%s“ (%s)"
+
+#: src/id3_tag.c:531
+#, c-format
+msgid ""
+"You have tried to save this tag to Unicode but it was detected that your "
+"version of id3lib is bugged.\n"
+"If you reload this file, some characters in the tag may be not displayed "
+"correctly...\n"
+"Please, apply to id3lib the patch src/id3lib/"
+"patch_id3lib_3.8.3_UTF16_writing_bug.diff\n"
+"available in EasyTAG package sources.\n"
+"Note that this message will appear only one time.\n"
+"\n"
+"File : %s"
+msgstr ""
+"Покушали сте да сачувате ознаку као уникод али је нађено да ваша верзија "
+"id3lib-а садржи грешку.\n"
+"Уколико поново учитате ову датотеку, неки карактери у ознаци можда неће бити "
+"приказани исправно...\n"
+"Молимо вас да, примените закрпу src/id3lib/"
+"patch_id3lib_3.8.3_UTF16_writing_bug.diff на id3lib\n"
+"доступну у изворном коду EasyTAG-а.\n"
+"Ова порука ће се приказати само једанпут!.\n"
+"\n"
+"Датотека : %s"
+
+#: src/id3_tag.c:577
+#, c-format
+msgid "Error while updating ID3v1 tag of '%s' (%s)"
+msgstr "Грешка при промени ID3v1 ознаке у „%s“ (%s)"
+
+#: src/id3_tag.c:591
+#, c-format
+msgid "Updated tag of '%s'"
+msgstr "Ознака у „%s“ промењена"
+
+#: src/id3_tag.c:610
+msgid "No error reported"
+msgstr "Нису пријављене грешке"
+
+#: src/id3_tag.c:612
+msgid "No available memory"
+msgstr "Немате доступну меморију"
+
+#: src/id3_tag.c:614
+msgid "No data to parse"
+msgstr "Нема података за обраду"
+
+#: src/id3_tag.c:616
+msgid "Improperly formatted data"
+msgstr "Неисправно форматирани подаци"
+
+#: src/id3_tag.c:618
+msgid "No buffer to write to"
+msgstr "Нема бафера за упис"
+
+#: src/id3_tag.c:620
+msgid "Buffer is too small"
+msgstr "Бафер је сувише мало"
+
+#: src/id3_tag.c:622
+msgid "Invalid frame ID"
+msgstr "Неисправан ИД оквира"
+
+#: src/id3_tag.c:624
+msgid "Requested field not found"
+msgstr "Затражено поље није нађено"
+
+#: src/id3_tag.c:626
+msgid "Unknown field type"
+msgstr "Непознат тип поља"
+
+#: src/id3_tag.c:628
+msgid "Tag is already attached to a file"
+msgstr "Ознака је већ додана датотеци"
+
+#: src/id3_tag.c:630
+msgid "Invalid tag version"
+msgstr "Неисправна верзија ознаке"
+
+#: src/id3_tag.c:632
+msgid "No file to parse"
+msgstr "Нема датотеке за обраду"
+
+#: src/id3_tag.c:634
+msgid "Attempting to write to a read-only file"
+msgstr "Покушавам са упишем у датотеку без дозвола за упис"
+
+#: src/id3_tag.c:636
+msgid "Error in compression/uncompression"
+msgstr "Грешка при компресији/декомпресији"
+
+#: src/id3_tag.c:638
+msgid "Unknown error message!"
+msgstr "Непозната порука о грешци!"
+
+#: src/id3_tag.c:1212
+#, 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 ""
+"Следећа оштећена датотека: „%s“\n"
+"ће проузроковати грешку у id3lib, па неће бити обрађена од стране програма."
+
+#: src/id3_tag.c:1214
+msgid "Corrupted file..."
+msgstr "Оштећена датотека"
+
+#: src/log.c:91
+msgid "Log"
+msgstr "Дневник измена"
+
+#: src/misc.c:214
+msgid " OK "
+msgstr "У реду"
+
+#: src/misc.c:219
+msgid " Yes "
+msgstr "Да"
+
+#: src/misc.c:224
+msgid " No "
+msgstr "Не"
+
+#: src/misc.c:229
+msgid " Apply "
+msgstr "Примени"
+
+#: src/misc.c:234
+msgid " Save "
+msgstr "Сачувај"
+
+#: src/misc.c:239
+msgid " Cancel "
+msgstr "Занемари"
+
+#: src/misc.c:244
+msgid " Close "
+msgstr "Затвори"
+
+#: src/misc.c:249
+msgid " Write "
+msgstr "Упиши"
+
+#: src/misc.c:254
+msgid " Execute "
+msgstr "Покрени"
+
+#: src/misc.c:259
+msgid " Search "
+msgstr "Тражи"
+
+#: src/misc.c:264
+msgid " Browse... "
+msgstr "Нађи..."
+
+#: src/misc.c:856
+msgid "Select directory..."
+msgstr "Одабери директоријум..."
+
+#: src/misc.c:861
+msgid "Select file..."
+msgstr "Одабери датотеку..."
+
+#: src/misc.c:931
+msgid "Warning..."
+msgstr "Упозорење..."
+
+#: src/misc.c:931
+msgid "No audio player defined!"
+msgstr "Није дефинисан програм за репродукцију звука!"
+
+#: src/misc.c:1033
+#, c-format
+msgid "Can't execute %s (%s)!\n"
+msgstr "Не могу да покренем %s (%s)!\n"
+
+#. Units Tab of file size (bytes,kilobytes,...)
+#: src/misc.c:1198 src/misc.c:1217
+msgid "B"
+msgstr "B"
+
+#: src/misc.c:1198 src/misc.c:1217
+msgid "KB"
+msgstr "KB"
+
+#: src/misc.c:1198 src/misc.c:1217
+msgid "MB"
+msgstr "MB"
+
+#: src/misc.c:1198 src/misc.c:1217
+msgid "GB"
+msgstr "GB"
+
+#: src/misc.c:1198 src/misc.c:1217
+msgid "TB"
+msgstr "TB"
+
+#: src/misc.c:1312
+msgid "Generate a playlist"
+msgstr "Начини листу нумера"
+
+#: src/misc.c:1336
+msgid "M3U Playlist Name"
+msgstr "Име M3U листе нумера"
+
+#: src/misc.c:1349
+msgid "Use directory name"
+msgstr "Користи име директоријума"
+
+#: src/misc.c:1373 src/misc.c:1470
+msgid "Edit Masks"
+msgstr "Уреди маске"
+
+#. Playlist options
+#: src/misc.c:1381
+msgid "Playlist Options"
+msgstr "Опције листе нумера"
+
+#: src/misc.c:1387
+msgid "Include only the selected files"
+msgstr "Укључи само изабране датотеке"
+
+#: src/misc.c:1390
+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:1397
+msgid "Use full path for files in playlist"
+msgstr "Користи пуне путање за датотеке у листи нумера"
+
+#: src/misc.c:1400
+msgid "Use relative path for files in playlist"
+msgstr "Користи релативне путање за датотеке у листи нумера"
+
+#. Create playlist in parent directory
+#: src/misc.c:1410
+msgid "Create playlist in the parent directory"
+msgstr "Начини листу нумера у родитељском директоријуму"
+
+#: src/misc.c:1413
+msgid "If activated, the playlist will be created in the parent directory."
+msgstr ""
+"Уколико је активирано, листа ће бити начињена у родитељском директоријуму."
+
+#. DOS Separator
+#: src/misc.c:1417
+msgid "Use DOS directory separator"
+msgstr "Користи ДОС-ов раздвајач датотека"
+
+#: src/misc.c:1422
+msgid ""
+"This option replaces the UNIX directory separator '/' into DOS separator "
+"'\\'."
+msgstr ""
+"Ова опција мења УНИКС-ов раздвајач датотека „/“ у ДОС-ов раздвајач „\\“."
+
+#: src/misc.c:1431
+msgid "Playlist Content"
+msgstr "Садржај листе нумера"
+
+#: src/misc.c:1437
+msgid "Write only list of files"
+msgstr "Упиши само листу датотека"
+
+#: src/misc.c:1441
+msgid "Write info using filename"
+msgstr "Упиши информације користећи име датотеке"
+
+#: src/misc.c:1444
+msgid "Write info using :"
+msgstr "Упиши информације користећи :"
+
+#: src/misc.c:1704
+#, c-format
+msgid ""
+"Playlist file '%s' already exists!\n"
+"Overwrite?"
+msgstr ""
+"Датотека са листом нумера „%s“ већ постоји!\n"
+"Да је препишем?"
+
+#: src/misc.c:1705
+msgid "Write Playlist..."
+msgstr "Уписујем листу нумера..."
+
+#. Writing fails...
+#: src/misc.c:1719
+#, c-format
+msgid ""
+"Can't write playlist file '%s'!\n"
+"(%s)"
+msgstr ""
+"Не могу да упишем листу нумера „%s“!\n"
+"(%s)"
+
+#: src/misc.c:1726
+#, c-format
+msgid "Written playlist file '%s'"
+msgstr "Листа нумера „%s“ је начињена"
+
+#: src/misc.c:1962
+msgid "CD"
+msgstr "ЦД"
+
+#: src/misc.c:1964
+msgid "Track"
+msgstr "Нумера"
+
+#: src/misc.c:1967 src/picture.c:821
+msgid "Composer"
+msgstr "Композитор"
+
+#: src/misc.c:1968
+msgid "Orig. Artist"
+msgstr "Ориг. извођач"
+
+#: src/misc.c:1969
+msgid "Copyright"
+msgstr "Ауторско право"
+
+#: src/misc.c:1970
+msgid "URL"
+msgstr "УРЛ"
+
+#: src/misc.c:1971
+msgid "Encoded by"
+msgstr "Кодирано помоћу"
+
+#: src/misc.c:1982
+msgid "Search a file"
+msgstr "Нађи датотеку"
+
+#: src/misc.c:2022
+msgid ""
+"Type the word to search into files. Or type nothing to display all files."
+msgstr ""
+"Унеси речи за претрагу унутар датотека. Или не уноси ништа за приказ свих "
+"датотека."
+
+#. Where...
+#: src/misc.c:2028
+msgid "In :"
+msgstr "У :"
+
+#: src/misc.c:2031
+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:2033
+msgid "the Tag"
+msgstr "ознака"
+
+#. Property of the search
+#: src/misc.c:2043 src/prefs.c:323
+msgid "Case sensitive"
+msgstr "Разликуј велика и мала лова"
+
+#: src/misc.c:2476
+#, c-format
+msgid "Found : %d file(s)"
+msgstr "Нађена(о) : %d датотека(е)"
+
+#: src/misc.c:2739
+msgid "Load the filenames from a TXT file"
+msgstr "Учитај имена датотека из текстуалног фајла"
+
+#: src/misc.c:2769
+msgid "File :"
+msgstr "Датотека :"
+
+#. Button 'load'
+#. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
+#: src/misc.c:2787
+msgid " Load "
+msgstr "Учитај"
+
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "Потврди преименовање датотеке"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "Уметни размак пре великог слова"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Уклони овај ред"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "Уклони све празне редове"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "Укључи само изабране датотеке"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "Укључи само изабране датотеке"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Освежи"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Упиши само листу датотека"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Изабери све редове"
+
+#: src/misc.c:3016
+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:3403
+msgid "Insert a blank line"
+msgstr "Унеси празан ред"
+
+#: src/misc.c:3409
+msgid "Delete this line"
+msgstr "Уклони овај ред"
+
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Помери маску нагоре"
+
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Помери маску надоле"
+
+#. Mode changed to profile name
+#: src/monkeyaudio_header.c:78 src/musepack_header.c:80
+msgid "Profile:"
+msgstr "Профил:"
+
+#: src/mp4_header.c:130
+msgid "Audio"
+msgstr "Аудио"
+
+#: src/mp4_header.c:131
+msgid "Unknown"
+msgstr "Непознато"
+
+#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+msgid "MP4 format invalid"
+msgstr "MP4 формат неисправан"
+
+#: src/mp4_header.c:273 src/mpeg_header.c:365
+#, c-format
+msgid "~%d kb/s"
+msgstr "~%d kb/s"
+
+#: src/mpeg_header.c:78
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/mpeg_header.c:79
+msgid "Joint stereo"
+msgstr "Придружени стерео"
+
+#: src/mpeg_header.c:80
+msgid "Dual channel"
+msgstr "Два канала"
+
+#: src/mpeg_header.c:81
+msgid "Single channel"
+msgstr "Један канал"
+
+#. mb->icon = icon;
+#: src/msgbox.c:135
+msgid "Repeat action for the rest of the files"
+msgstr "Понови операцију на остатак датотека"
+
+#: src/ogg_header.c:100
+#, c-format
+msgid ""
+"Ogg Vorbis: The specified bitstream does not exist or the file has been "
+"initialized improperly (file: '%s')."
+msgstr ""
+"Ogg Vorbis: Изабрани битски ток не постоји или је датотека лоше започета "
+"(датотека: „%s“)."
+
+#: src/ogg_header.c:131
+#, c-format
+msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
+msgstr "Ogg Vorbis: Читање са медијума је изазвало грешку (датотека: „%s“)."
+
+#: src/ogg_header.c:134
+#, c-format
+msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
+msgstr "Ogg Vorbis: Битски ток није типа Vorbis (датотека: „%s“)."
+
+#: src/ogg_header.c:137
+#, c-format
+msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
+msgstr "Ogg Vorbis: Верзија Vorbis-а се не поклапа (датотека: „%s“)."
+
+#: src/ogg_header.c:140
+#, c-format
+msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
+msgstr "Ogg Vorbis: Погрешно заглавље Vorbis битског тока (датотека: „%s“)."
+
+#: src/ogg_header.c:143
+#, c-format
+msgid ""
+"Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack corruption "
+"(file: '%s')."
+msgstr ""
+"Ogg Vorbis: Унутарња логичка грешка, указује на грешку у програму или гомилу "
+"оштећења (датотека: „%s“)."
+
+#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#, c-format
+msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
+msgstr "Грешка: Неуспело отварање датотеке: „%s“ као vorbis (%s)."
+
+#: src/ogg_tag.c:163
+#, c-format
+msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
+msgstr "Упозорење : Ogg Vorbis датотека „%s“ садржи ID3v2 ознаку."
+
+#: src/picture.c:293
+msgid "Add pictures"
+msgstr "Додај слике"
+
+#: src/picture.c:303 src/picture.c:661
+msgid "All Files"
+msgstr "Све датотеке"
+
+#: src/picture.c:309 src/picture.c:667
+msgid "PNG and JPEG"
+msgstr "PNG и JPEG"
+
+#: src/picture.c:445
+#, c-format
+msgid "Picture Properties %d/%d"
+msgstr "Поставке слике %d/%d"
+
+#: src/picture.c:475
+msgid "Picture Type"
+msgstr "Тип слике"
+
+#. Description
+#: src/picture.c:532
+msgid "Picture Description:"
+msgstr "Опис слике:"
+
+#: src/picture.c:649
+#, c-format
+msgid "Save picture %d/%d"
+msgstr "Сачувај слику %d/%d"
+
+#: src/picture.c:732
+#, c-format
+msgid ""
+"The following file already exists :\n"
+"'%s'\n"
+"Do you want to overwrite?"
+msgstr ""
+"Следећа датотека већ постоји :\n"
+"„%s“\n"
+"Желите ли да је препишете?"
+
+#: src/picture.c:734
+msgid "Save file..."
+msgstr "Сачувај датотеку..."
+
+#: src/picture.c:786
+msgid "JPEG image"
+msgstr "JPEG слика"
+
+#: src/picture.c:788
+msgid "PNG image"
+msgstr "PNG слика"
+
+#: src/picture.c:790
+msgid "Unknown image"
+msgstr "Непозната слика"
+
+#: src/picture.c:801
+msgid "32x32 pixel PNG file icon"
+msgstr "PNG иконица, 32x32 пиксела"
+
+#: src/picture.c:803
+msgid "Other file icon"
+msgstr "Остале иконице датотеке"
+
+#: src/picture.c:805
+msgid "Cover (front)"
+msgstr "Омот (лице)"
+
+#: src/picture.c:807
+msgid "Cover (back)"
+msgstr "Омот (полеђина)"
+
+#: src/picture.c:809
+msgid "Leaflet page"
+msgstr "Страна са летком"
+
+#: src/picture.c:811
+msgid "Media (e.g. label side of CD)"
+msgstr "Медијум (пр. страна са натписом ЦД-а)"
+
+#: src/picture.c:813
+msgid "Lead artist/lead performer/soloist"
+msgstr "Водећи уметник/водећи извођач/солиста"
+
+#: src/picture.c:815
+msgid "Artist/performer"
+msgstr "Уметник/Извођач"
+
+#: src/picture.c:817
+msgid "Conductor"
+msgstr "Диригент"
+
+#: src/picture.c:819
+msgid "Band/Orchestra"
+msgstr "Бенд/Оркестар"
+
+#: src/picture.c:823
+msgid "Lyricist/text writer"
+msgstr "Аутор текстова"
+
+#: src/picture.c:825
+msgid "Recording location"
+msgstr "Место снимања"
+
+#: src/picture.c:827
+msgid "During recording"
+msgstr "У току снимања"
+
+#: src/picture.c:829
+msgid "During performance"
+msgstr "У току извођења"
+
+#: src/picture.c:831
+msgid "Movie/video screen capture"
+msgstr "Филм/Видео запис"
+
+#: src/picture.c:833
+msgid "A bright coloured fish"
+msgstr "Светло обојена риба"
+
+#: src/picture.c:835
+msgid "Illustration"
+msgstr "Илустрација"
+
+#: src/picture.c:837
+msgid "Band/Artist logotype"
+msgstr "Лого бенда/извођача"
+
+#: src/picture.c:839
+msgid "Publisher/studio logotype"
+msgstr "Лого издавача/студија"
+
+#: src/picture.c:841
+msgid "Unknown picture type"
+msgstr "Непознати тип слике"
+
+#: src/picture.c:869 src/picture.c:880
+msgid "pixels"
+msgstr "пиксела"
+
+#: src/picture.c:870 src/picture.c:881
+msgid "Type"
+msgstr "Тип"
+
+#: src/picture.c:882
+msgid "Description"
+msgstr "Опис"
+
+#: src/picture.c:984
+msgid ""
+"Can't display the picture, as not enough data has been read to determine how "
+"to create the image buffer."
+msgstr ""
+"Не могу да прикажем слику јер је недовољно података учитано да бих знао како "
+"да направим бафер слике."
+
+#: src/picture.c:987
+msgid "Loading Picture File..."
+msgstr "Учитавам датотеку са сликом..."
+
+#: src/picture.c:1081
+#, c-format
+msgid ""
+"Can't open file :\n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"Не могу да отворим датотеку :\n"
+"„%s“!\n"
+"(%s)"
+
+#: src/picture.c:1089
+msgid "Picture file not loaded..."
+msgstr "Датотека са сликом није учитана..."
+
+#. Title
+#: src/prefs.c:118
+msgid "Preferences..."
+msgstr "Поставке..."
+
+#. File Browser frame
+#: src/prefs.c:156
+msgid "File Browser"
+msgstr "Разгледач датотека"
+
+#. Label
+#: src/prefs.c:167
+msgid "Default directory :"
+msgstr "Подразумевани директоријум:"
+
+#: src/prefs.c:179
+msgid ""
+"Specify the directory where your files are located. This path will be loaded "
+"when EasyTAG starts without parameter."
+msgstr ""
+"Одреди директоријум где се налазе ваше датотеке. Ова путања ће бити учитана "
+"при покретању EasyTAG-а без задатих параметара."
+
+#. Load directory on startup
+#: src/prefs.c:200
+msgid ""
+"Load on startup the default directory or the directory passed as argument"
+msgstr ""
+"Учитај подразумевани директоријум или директоријум задат као аргумент по "
+"покретању програма."
+
+#: src/prefs.c:203
+msgid ""
+"Automatically search files, when EasyTAG starts, into the default directory. "
+"Note that this path may be overriden by the parameter passed to easytag "
+"(easytag /path_to/mp3_files)."
+msgstr ""
+"Аутоматски тражи датотеке у подразумеваном директоријуму када се покрене "
+"EasyTAG. Ова путања може бити преписана параметром прослеђеним програму "
+"(easytag /путања_до/mp3_датотека)."
+
+#. Browse subdirectories
+#: src/prefs.c:208
+msgid "Search subdirectories"
+msgstr "Претражи под-директоријуме"
+
+#: src/prefs.c:211
+msgid "Search subdirectories for files when reading a directory into the tree."
+msgstr ""
+"Тражи датотеке и у под-директоријумима при учитавању директоријума у стабло. "
+
+#. Open the node to show subdirectories
+#: src/prefs.c:215
+msgid "Show subdirectories when selecting a directory"
+msgstr "Прикажи под-директоријуме при избору директоријума"
+
+#: src/prefs.c:219
+msgid ""
+"This expands the selected node into the file browser to display the sub-"
+"directories."
+msgstr ""
+"Ово проширује изабрани чвор у разгледачу датотека да би приказао под-"
+"директоријуме."
+
+#. Browse hidden directories
+#: src/prefs.c:223
+msgid "Search hidden directories"
+msgstr "Претражи скривене директоријуме"
+
+#: src/prefs.c:228
+msgid "Search hidden directories for files (directories starting by a '.')."
+msgstr ""
+"Тражи датотеке у скривеним директоријумима (директоријумима који почињу са "
+"„.“)."
+
+#. User interface
+#: src/prefs.c:247
+msgid "User Interface"
+msgstr "Корисничко окружење"
+
+#. Show header infos
+#: src/prefs.c:254
+msgid "Show header informations of file"
+msgstr "Прикажи информације заглавља датотеке"
+
+#: src/prefs.c:257
+msgid ""
+"If activated, informations about the file as the bitrate, the time, the "
+"size, will be displayed under the filename entry."
+msgstr ""
+"Уколико је активирано, информације о датотекама као што су битски проток, "
+"време, величина ће бити приказане испод дела са именом датотеке."
+
+#: src/prefs.c:264
+msgid "Display changed files in list using :"
+msgstr "Прикажи измењене датотеке у листи користећи :"
+
+#: src/prefs.c:267
+msgid "Red color"
+msgstr "Црвена боја"
+
+#: src/prefs.c:273
+msgid "Bold style"
+msgstr "Подебљано"
+
+#. Sorting List Options
+#: src/prefs.c:279
+msgid "Sorting List Options"
+msgstr "Опције сортирања листе"
+
+#. Sorting method
+#: src/prefs.c:289
+msgid "Sort the file list by :"
+msgstr "Сортирај листу датотека :"
+
+#. Two columns
+#. Items of option menu
+#: src/prefs.c:300
+msgid "Ascending file name"
+msgstr "Растући, по имену датотека"
+
+#: src/prefs.c:301
+msgid "Descending file name"
+msgstr "Опадајући, по имену датотека"
+
+#: src/prefs.c:302
+msgid "Ascending track number"
+msgstr "Растући, по броју нумере"
+
+#: src/prefs.c:303
+msgid "Descending track number"
+msgstr "Опадајући, по броју нумере"
+
+#: src/prefs.c:304
+msgid "Ascending creation date"
+msgstr "Растући, по времену настанка"
+
+#: src/prefs.c:305
+msgid "Descending creation date"
+msgstr "Опадајући, по времену настанка"
+
+#: src/prefs.c:306
+msgid "Ascending title"
+msgstr "Растући, по називу"
+
+#: src/prefs.c:307
+msgid "Descending title"
+msgstr "Опадајући, по називу"
+
+#: src/prefs.c:308
+msgid "Ascending artist"
+msgstr "Растући, по извођачу"
+
+#: src/prefs.c:309
+msgid "Descending artist"
+msgstr "Опадајући, по извођачу"
+
+#: src/prefs.c:310
+msgid "Ascending album"
+msgstr "Растући, по албуму"
+
+#: src/prefs.c:311
+msgid "Descending album"
+msgstr "Опадајући, по албуму"
+
+#: src/prefs.c:312
+msgid "Ascending year"
+msgstr "Растући, по години"
+
+#: src/prefs.c:313
+msgid "Descending year"
+msgstr "Опадајући, по години"
+
+#: src/prefs.c:314
+msgid "Ascending genre"
+msgstr "Растући, по жанру"
+
+#: src/prefs.c:315
+msgid "Descending genre"
+msgstr "Опадајући, по жанру"
+
+#: src/prefs.c:316
+msgid "Ascending comment"
+msgstr "Растући, по коментару"
+
+#: src/prefs.c:317
+msgid "Descending comment"
+msgstr "Опадајући, по коментару"
+
+#: src/prefs.c:320
+msgid "Select the type of file sorting when loading a directory."
+msgstr "Изабери тип сортирања датотека при учитавању директоријума."
+
+#: src/prefs.c:329
+msgid "If activated, the sorting of the list will be dependent on the case."
+msgstr ""
+"Уколико је активирано, сортирање листе ће бити вршено по одређеним условима."
+
+#. Message Dialog Position
+#: src/prefs.c:333
+msgid "Message Dialog Position"
+msgstr "Позиција прозора за обавештења"
+
+#: src/prefs.c:341
+msgid "No particular position"
+msgstr "Без посебне позиције"
+
+#: src/prefs.c:345
+msgid "Let the Window Manager to place the windows."
+msgstr "Препусти позиционирање управнику прозорима."
+
+#: src/prefs.c:350
+msgid "Center of the main window"
+msgstr "Центар главног прозора"
+
+#: src/prefs.c:354
+msgid "Windows should be placed in the center of the main window."
+msgstr "Прозори ће вероватно бити постављени у средини главног прозора."
+
+#: src/prefs.c:359
+msgid "Center of the screen"
+msgstr "Центар екрана"
+
+#: src/prefs.c:363
+msgid "Windows should be placed in the center of the screen."
+msgstr "Прозори ће бити постављени у средини екрана."
+
+#: src/prefs.c:368
+msgid "Mouse position"
+msgstr "Позиција курсора"
+
+#: src/prefs.c:372
+msgid "Windows should be placed at the current mouse position."
+msgstr "Прозори ће бити постављени на тренутну позицију курсора."
+
+#. File Player
+#: src/prefs.c:376
+msgid "File Audio Player"
+msgstr "Програм за репродукцију звука"
+
+#: src/prefs.c:388
+msgid "Player to run :"
+msgstr "Свирач за покретање:"
+
+#: src/prefs.c:393
+msgid ""
+"Enter the program used to play the files. Some arguments can be passed for "
+"the program (as 'xmms -p') before to receive files as other arguments."
+msgstr ""
+"Унеси програм који ће бити коришћен за репродукцију датотека. Неки аргументи "
+"могу бити прослеђени програму (нпр. „xmms -p“) пре добијања датотека као "
+"последњег аргумента."
+
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Опције ознаке"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "Центар главног прозора"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr ""
+"Уколико је активирано, листа ће бити начињена у родитељском директоријуму."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
+#.
+#. * File Settings
+#.
+#: src/prefs.c:447 src/prefs.c:448
+msgid "File Settings"
+msgstr "Подешавање датотека"
+
+#. File (name) Options
+#: src/prefs.c:458
+msgid "File Options"
+msgstr "Опције датотека"
+
+#: src/prefs.c:464
+msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
+msgstr ""
+"Замени недозвољене карактере у имену датотеке (за Windows и ЦД уређаје)"
+
+#: src/prefs.c:467
+msgid ""
+"Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
+"('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
+"problem when renaming the file. This is usefull when renaming the file from "
+"the tag with the scanner."
+msgstr ""
+"Замени недозвољене карактере за FAT32/16 и ISO9660 + Joliet систем датотека "
+"(„\\“, „:“, „;“, „*“, „?“, „\", „<“, „>“, „|“) у сваком имену датотеке да би "
+"избегао проблеме са преименовањем датотеке. Ово је корисно при преименовању "
+"датотека из ознака, скенером."
+
+#. Extension case (lower/upper?)
+#: src/prefs.c:476
+msgid "Convert filename extension to :"
+msgstr "Промени екстензију датотеке у :"
+
+#: src/prefs.c:479
+msgid "Lower Case"
+msgstr "Мала слова"
+
+#: src/prefs.c:482
+msgid "For example, the extension will be converted to '.mp3'"
+msgstr "На пример, екстензија ће бити преименована у „.mp3“"
+
+#: src/prefs.c:485
+msgid "Upper Case"
+msgstr "Велика слова"
+
+#: src/prefs.c:488
+msgid "For example, the extension will be converted to '.MP3'"
+msgstr "На пример, екстензија ће бити преименована у „.MP3“"
+
+#: src/prefs.c:491
+msgid "No Change"
+msgstr "Без измене"
+
+#: src/prefs.c:494
+msgid "The extension will not be converted"
+msgstr "Екстензија неће бити преименована"
+
+#. Preserve modification time
+#: src/prefs.c:497
+msgid "Preserve modification time of the file"
+msgstr "Не мењај време измене датотеке"
+
+#: src/prefs.c:500
+msgid ""
+"Preserve the modification time (in file properties) when saving the file."
+msgstr ""
+"Не мењај време измене датотеке (у особинама датотеке) при чувању датотеке."
+
+#. Change directory modification time
+#: src/prefs.c:504
+msgid ""
+"Update modification time of the parent directory of the file (recommended "
+"when using Amarok)"
+msgstr ""
+"Промени време измене родитељског директоријума датотеке (препоручљиво ако "
+"користите Amarok)"
+
+#: src/prefs.c:508
+msgid ""
+"The modification time of the parent directory of the file will be updated "
+"when saving tag the file. At the present time it is automatically done only "
+"when renaming a file.\n"
+"This feature is interesting when using applications like Amarok. For "
+"performance reasons, they refresh file informations by detecting changes of "
+"the parent directory."
+msgstr ""
+"Време измене родитељског директоријума датотеке ће ити промењено следећи пут "
+"када сачувате ту датотеку.  Данас је то једино могуће при преименовању "
+"датотеке.\n"
+"Ова опција је интересантна када користите програме за репродукцију звука као "
+"што је Amarok. Ради боље перформансе, програм освежава информације само када "
+"примети да су над неким директоријумом извршене промене."
+
+#. Character Set for File Name
+#: src/prefs.c:516
+msgid "Character Set for File Name"
+msgstr "Сет карактера за имена датотека"
+
+#. Rules for character set
+#: src/prefs.c:532
+msgid ""
+"Rules to apply if some characters can't be converted to the system character "
+"encoding when writing filename:"
+msgstr ""
+"Правила за примењивање уколико неки карактери не могу бити преведени у "
+"системско кодирање при упису имена датотеке:"
+
+#: src/prefs.c:540
+msgid "Try an other character encoding"
+msgstr "Пробај друго кодирање карактера"
+
+#: src/prefs.c:544
+msgid ""
+"With this option, it will try the conversion to the encoding associated to "
+"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 ""
+"Са овом опцијом покушаће се превођење кодирања карактера како то одређује "
+"ваша локализација система (на пример : ISO-8859-1 за „fr“, KOI8-R за „ru“, "
+"ISO-8859-2 за „ro“). Уколико не успе, покушаће се са ISO-8859-1 кодирањем."
+
+#: src/prefs.c:551
+msgid ""
+"Force using the system character encoding and activate the transliteration"
+msgstr ""
+"Приморај коришћење системског кодирања карактера и активирај превођење "
+"знакова"
+
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it can be approximated through one or several similarly "
+"looking characters."
+msgstr ""
+"Са овом опцијом, када карактер не може бити представљен жељеним сетом "
+"карактера, биће преведен у неки од њему сличних карактера."
+
+#: src/prefs.c:560
+msgid ""
+"Force using the system character encoding and silently discard some "
+"characters"
+msgstr ""
+"Приморај коришћење системског кодирања карактера и занемари неке карактере"
+
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+msgid ""
+"With this option, when a characters cannot be represented in the target "
+"character set, it will be silently discarded."
+msgstr ""
+"Са овом опцијом, када карактер не може бити представљен жељеним сетом "
+"карактера, биће занемарен без обавештавања о томе."
+
+#.
+#. * Tag Settings
+#.
+#: src/prefs.c:572 src/prefs.c:573
+msgid "Tag Settings"
+msgstr "Поставке ознака"
+
+#. Tag Options
+#: src/prefs.c:582
+msgid "Tag Options"
+msgstr "Опције ознаке"
+
+#: src/prefs.c:588
+msgid "Auto completion of date if not complete"
+msgstr "Аутоматска допуна датума ако није цео"
+
+#: src/prefs.c:591
+msgid ""
+"Try to complete the year field if you enter only the last numerals of the "
+"date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
+"1996, 95 => 1995, ...)."
+msgstr ""
+"Покушава да попуни поље са годином уколико унесете само задње децимале "
+"датума (нпр. уколико је тренутна година 2005 број 5 ће бити 2005; 4 => 2004; "
+"6 => 1996; 95 => 1995)."
+
+#: src/prefs.c:598
+msgid "Write the track field with the following number of digits :"
+msgstr "Упиши поље са бројем нумере следећим бројем децимала:"
+
+#: src/prefs.c:601
+msgid ""
+"If activated, the track field is written using the number '0' as padding to "
+"obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
+"'10',...). Else it keeps the 'raw' track value."
+msgstr ""
+"Уколико је активирано, поље за број нумере ће бити уписано користећи број "
+"„0“ као префикс за бројеве са „n“ цифара (нпр. за бројеве са две цифре „05“, "
+"„09“, „10“...). У супротном ће број бити уписан без префикса (нпр. „5“, „9“, "
+"„10“...)."
+
+#: src/prefs.c:616
+msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
+msgstr "Ogg Vorbis датотеке : Упиши коментаре у XMMS-ов формат"
+
+#: src/prefs.c:619
+msgid ""
+"XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
+"files as other apps do. In fact, this field is usually labeled with "
+"'comment=', whereas XMMS uses only `='. Please, uncheck this option if you "
+"don't want other apps to complain about an unknown field. Comments won't be "
+"shown in XMMS, though."
+msgstr ""
+"XMMS непрописно идентификује коментаре у Ogg Vorbis датотекама, као што то "
+"чине остали програми за репродукцију звука. У ствари, ово поље је обично "
+"означено са „comment=вредност“, где XMMS користи само „=“. Уколико не желите "
+"да се остали програми жале на постојање непознатог поља де-активирајте ову "
+"опцију. Додуше, коментари неће бити приказани у XMMS-у."
+
+#: src/prefs.c:634
+msgid ""
+"Tag field focus when switching files in list with shortcuts Page Up/Page "
+"Down:"
+msgstr ""
+"Промени избор поља при промени датотеке у листи пречицама Page Up/Page Down:"
+
+#: src/prefs.c:643
+msgid "Keep focus to the same tag field"
+msgstr "Тако да задржиш избор на пољу исте ознаке"
+
+#: src/prefs.c:649
+msgid "Return focus to the first tag field (ie 'Title' field)"
+msgstr "Тако да поставиш избор на прво поље (тј. на поље „Наслов“)"
+
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(SetFocusToFirstTagField),SET_FOCUS_TO_FIRST_TAG_FIELD);
+#.
+#. * ID3 Tag Settings
+#.
+#: src/prefs.c:657 src/prefs.c:658
+msgid "ID3 Tag Settings"
+msgstr "Поставке ID3 ознака"
+
+#. Tag Rules frame
+#: src/prefs.c:670
+msgid "ID3 Tag Rules"
+msgstr "Правила ID3 ознака"
+
+#. Write ID3 tags in FLAC files
+#: src/prefs.c:682
+msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
+msgstr "Упиши ID3 ознаке у FLAC датотекама (као додатак FLAC ознакама)"
+
+#: src/prefs.c:685
+msgid ""
+"If activated, ID3 tags will be also added in the FLAC file (according the "
+"two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
+msgstr ""
+"Уколико је активирано, ID3 ознаке ће такође бити додате FLAC датотекама "
+"(следећи претходна правила, уз постојећу FLAC ознаку). У супротном ID3 "
+"ознака ће бити уклоњена."
+
+#. Strip tag when fields (managed by EasyTAG) are empty
+#: src/prefs.c:690
+msgid "Strip tags if all fields are set to blank"
+msgstr "Обриши ознаке ако су поља празна"
+
+#: src/prefs.c:693
+msgid ""
+"As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
+"Genre or Comment (as an attached picture, lyrics, ...), this option allows "
+"you to strip the whole tag when these seven standard data fields have been "
+"set to blank."
+msgstr ""
+"Пошто ID3v2 ознаке могу да садрже и друге податке који не спадају у Наслов, "
+"Извођач, Албум, Година, Жанр, Коментар (као што су слике, текстови,...), ова "
+"опција вам омогућава да обришете целу ознаку када су ова стандардна седам "
+"поља празна."
+
+#. Convert old ID3v2 tag version
+#: src/prefs.c:699
+msgid "Automatically convert old ID3v2 tag versions"
+msgstr "Аутоматски преведи стару ID3v2 верзију ознака"
+
+#: src/prefs.c:702
+msgid ""
+"If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
+"ID3v2.3 version."
+msgstr ""
+"Уколико је активирано, стара верзија ID3v2 ознаке (као што је ID3v2.2) ће "
+"бити надограђена на верзију ID3v2.3."
+
+#. Use CRC32
+#: src/prefs.c:706
+msgid "Use CRC32"
+msgstr "Користи CRC32"
+
+#: src/prefs.c:709
+msgid "Set CRC32 in the ID3v2 tags"
+msgstr "Користи CRC32 у ID3v2 ознакама."
+
+#. Use Compression
+#: src/prefs.c:712
+msgid "Use Compression"
+msgstr "Користи паковање"
+
+#: src/prefs.c:715
+msgid "Set Compression in the ID3v2 tags"
+msgstr "Користи паковање у ID3v2 ознакама."
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:718
+msgid "Character Set for writing ID3 tags"
+msgstr "Сет карактера за упис ID3 ознака."
+
+#. ID3v2 tags
+#: src/prefs.c:725
+msgid "ID3v2 tags"
+msgstr "ID3v2 ознаке"
+
+#. Write ID3v2 tag
+#: src/prefs.c:738
+msgid "Write ID3v2 tag"
+msgstr "Упиши ID3v2 ознаке"
+
+#: src/prefs.c:741
+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
+msgid "Version:"
+msgstr "Верзија:"
+
+#: src/prefs.c:755
+msgid ""
+"Select the ID3v2 tag version to write:\n"
+" - ID3v2.3 is written using id3lib,\n"
+" - ID3v2.4 is written using libid3tag (recommended)."
+msgstr ""
+"Изабери ID3v2 ознаку за упис:\n"
+" - ID3v2.3 је уписана користећи id3lib,\n"
+" - ID3v2.4 је уписана користећи libid3tag (препоручљиво)."
+
+#. Charset
+#. Id3V1 writing character set
+#: src/prefs.c:769 src/prefs.c:867
+msgid "Charset:"
+msgstr "Сет карактера:"
+
+#. Unicode
+#: src/prefs.c:777
+msgid "Unicode "
+msgstr "Уникод"
+
+#: src/prefs.c:785
+msgid "Unicode type to use"
+msgstr "Тип Уникода који да користим."
+
+#: src/prefs.c:808
+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:883
+msgid "Additional settings for iconv():"
+msgstr "Додатне поставке за iconv():"
+
+#: src/prefs.c:822 src/prefs.c:888
+msgid "No"
+msgstr "Не"
+
+#: src/prefs.c:827 src/prefs.c:893
+msgid "//TRANSLIT"
+msgstr "Преведи"
+
+#: src/prefs.c:836 src/prefs.c:902
+msgid "//IGNORE"
+msgstr "Игнориши"
+
+#. ID3v1 tags
+#: src/prefs.c:844
+msgid "ID3v1 tags"
+msgstr "ID3v1 ознаке"
+
+#. Write ID3v1 tag
+#: src/prefs.c:858
+msgid "Write ID3v1.x tag"
+msgstr "Упиши ID3v1.x ознаку"
+
+#: src/prefs.c:861
+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:878
+msgid "Character set used to write ID3v1 tag data in the file."
+msgstr "Сет карактера за упис ID3v1 ознака у датотеци."
+
+#. Character Set for reading tag
+#: src/prefs.c:910
+msgid "Character Set for reading ID3 tags"
+msgstr "Сет карактера за читање ID3 ознака."
+
+#: src/prefs.c:924
+msgid "Non-standart:"
+msgstr "Нестандардно:"
+
+#: src/prefs.c:929
+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: "
+"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"
+"  - If unicode was not used, Russian people can select the character set "
+"'Windows-1251' to load tags written under Windows. And 'KOI8-R' to load tags "
+"written under Unix systems."
+msgstr ""
+"Овај сет карактера ће бити коришћен при читању података за превођење сваког "
+"карактера нађеног у ISO-8859-1 пољу ознаке (на пример ID3v2 и/или ID3v1 "
+"ознаке).\n"
+"\n"
+"На пример :\n"
+" - у претходним верзијама EasyTAG-а могли сте сачувати UTF-8 карактер у ISO-"
+"8859-1 пољу. Ово није било исправно! Да би превели ове ознаке у Уникод "
+"активирајте ову опцију и изаберите UTF-8. Такође морате активирати опцију "
+"изнад „Покушај да сачуваш ознаке у ISO-8859-1. Уколико није могуће, користи "
+"Уникод (препоручљиво)“ или „Увек сачувај ознаке у Уникод сет карактера“.\n"
+" - уколико Уникод није коришћен, Руси могу одабрати „Windows-1251“ сет за "
+"читање ознака уписаних под Windows-ом, или „KOI8-R“ за читање ознака "
+"уписаним под Уникс системима."
+
+#: src/prefs.c:947
+msgid "Character set used to read tag data in the file."
+msgstr "Сет карактера коришћен при читању ознака у датотекама."
+
+#.
+#. * Scanner
+#.
+#: src/prefs.c:962 src/prefs.c:963
+msgid "Scanner"
+msgstr "Скенер"
+
+#. Character conversion for the 'Fill Tag' scanner (=> FTS...)
+#: src/prefs.c:975
+msgid "Fill Tag Scanner - Character Conversion"
+msgstr "Скенер за попуњавање ознаке - превођење карактера"
+
+#: src/prefs.c:981 src/prefs.c:1007
+msgid "Convert underscore character '_' and string '%20' to space ' '"
+msgstr "Преведи доње цртице „_“ и карактер „%20“ у размак „ “"
+
+#: src/prefs.c:983 src/prefs.c:1009
+msgid "Convert space ' ' to underscore '_'"
+msgstr "Преведи размак „ “ у дољу цртицу „_“"
+
+#: src/prefs.c:995 src/prefs.c:997
+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:1001
+msgid "Rename File Scanner - Character Conversion"
+msgstr "Скенер за промену имена датотекама - превођење карактера"
+
+#: src/prefs.c:1021 src/prefs.c:1023
+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:1027
+msgid "Process Fields Scanner - Character Conversion"
+msgstr "Скенер за обраду поља - превођење карактера"
+
+#. Don't convert some words like to, feat. first letter uppercase.
+#: src/prefs.c:1034
+msgid ""
+"Don't uppercase first letter of words for some prepositions and articles."
+msgstr "Немој да повећаш прво слово речи за неке предлоге и чланове."
+
+#: src/prefs.c:1038
+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 "
+"word' (for example, you will obtain 'Text in an Entry' instead of 'Text In "
+"An Entry')."
+msgstr ""
+"Немој да преводиш прво слово сваке речи као што су енглески предлози, "
+"чланови и речи типа feat., када скенер користи опцију „Прво слово сваке речи "
+"велико“ (на пример, добићете „Text in an Entry“ уместо „Text In An Entry“)."
+
+#. Properties of the scanner window
+#: src/prefs.c:1044
+msgid "Scanner Window"
+msgstr "Прозор скенера"
+
+#: src/prefs.c:1050
+msgid "Open the Scanner Window on startup"
+msgstr "Отвори прозор скенера при покретању програма"
+
+#: src/prefs.c:1053
+msgid ""
+"Activate this option to open automatically the scanner window when EasyTAG "
+"starts."
+msgstr ""
+"Активирање ове опције ће аутоматски отворити прозор скенера при покретању "
+"EasyTAG програма."
+
+#: src/prefs.c:1056
+msgid "Scanner window always on top"
+msgstr "Прозор скенера увек на врху"
+
+#: src/prefs.c:1059
+msgid ""
+"If activated, the window which contains the masks will stay always over the "
+"main window."
+msgstr ""
+"Уколико је активирано, прозор који садржи маске ће увек стајати преко "
+"главног прозора."
+
+#. Other options
+#: src/prefs.c:1064
+msgid "Fields"
+msgstr "Поља"
+
+#. Overwrite text into tag fields
+#: src/prefs.c:1071
+msgid "Overwrite fields when scanning tag"
+msgstr "Препиши сва поља при скенирању ознаке"
+
+#: src/prefs.c:1074
+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:1085
+msgid "Set this text as default comment :"
+msgstr "Постави овај текст као подразумевани коментар:"
+
+#: src/prefs.c:1088
+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:1105
+msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
+msgstr ""
+"Користи CRC32 као подразумевани коментар (само за датотеке са ID3 ознакама)."
+
+#: src/prefs.c:1109
+msgid ""
+"Calculates the CRC-32 value of the file and writes it into the comment field "
+"when using the 'Fill Tag' scanner."
+msgstr ""
+"Прорачунава CRC-32 вредност датотека и уписује их у поље са коментаром при "
+"коришћењу скенера за попуњавање ознака."
+
+#.
+#. * CDDB
+#.
+#: src/prefs.c:1120 src/prefs.c:1121
+msgid "CD Data Base"
+msgstr "ЦД база података"
+
+#. CDDB Server Settings (Automatic Search)
+#: src/prefs.c:1130
+msgid "Server Settings for Automatic Search"
+msgstr "Поставке сервера за аутоматску претрагу"
+
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+msgid "Name :"
+msgstr "Име :"
+
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+msgid "Port :"
+msgstr "Порт :"
+
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+msgid "CGI Path :"
+msgstr "CGI путања :"
+
+#. CDDB Server Settings (Manual Search)
+#: src/prefs.c:1204
+msgid "Server Settings for Manual Search"
+msgstr "Поставке сервера за ручну претрагу"
+
+#. Local access for CDDB (Automatic Search)
+#: src/prefs.c:1239
+msgid "Local CD Data Base"
+msgstr "Локална ЦД баса података"
+
+#: src/prefs.c:1247
+msgid "Path :"
+msgstr "Путања :"
+
+#: src/prefs.c:1258
+msgid ""
+"Specify the directory where are located the local cd data base. The local cd "
+"data base contains the eleven following directories 'blues', 'classical', "
+"'country', 'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' "
+"and 'misc'."
+msgstr ""
+"Унеси путању до директоријума где је сачувана локална база ЦД-а. Локална "
+"база садржи једанаест директоријума „blues“, „classical“, „country“, „data“, "
+"„folk“, „jazz“, „newage“, „reggae“, „rock“, „soundtrack“ и „misc“."
+
+#. CDDB Proxy Settings
+#: src/prefs.c:1284
+msgid "Proxy Settings"
+msgstr "Поставке мрежног посредника"
+
+#: src/prefs.c:1293
+msgid "Use a proxy"
+msgstr "Користи мрежни посредник"
+
+#: src/prefs.c:1296
+msgid "Set active the settings of the proxy server."
+msgstr "Активира поставке мрежног посредника."
+
+#: src/prefs.c:1301
+msgid "Host Name :"
+msgstr "Име посредника :"
+
+#: src/prefs.c:1308
+msgid "Name of the proxy server."
+msgstr "Име сервера мрежног посредника."
+
+#: src/prefs.c:1316
+msgid "Port of the proxy server."
+msgstr "Порт мрежног посредника"
+
+#: src/prefs.c:1321
+msgid "User Name :"
+msgstr "Корисничко име :"
+
+#: src/prefs.c:1328
+msgid "Name of user for the the proxy server."
+msgstr "Име корисника мрежног посредника."
+
+#: src/prefs.c:1329
+msgid "User Password :"
+msgstr "Лозинка :"
+
+#: src/prefs.c:1337
+msgid "Password of user for the the proxy server."
+msgstr "Лозинка корисника мрежног посредника."
+
+#. Track Name list (CDDB results)
+#: src/prefs.c:1342
+msgid "Track Name List"
+msgstr "Листа имена нумера"
+
+#: src/prefs.c:1349
+msgid ""
+"Select corresponding audio file (according position or DLM if activated "
+"below)"
+msgstr ""
+"Изабери одговарајућу аудио датотеку (судећи по месту или ДЛМ-у уколико је "
+"активирано испод)"
+
+#: src/prefs.c:1353
+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:1358
+msgid ""
+"Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
+"files (using filename)"
+msgstr ""
+"Користи Левенштајнов алгоритам (ДЛМ) за поклапање редова (користећи наслов) "
+"са аудио датотекама (користећи имена датотека)"
+
+#.
+#. * Confirmation
+#.
+#: src/prefs.c:1373 src/prefs.c:1374
+msgid "Confirmation"
+msgstr "Потврде"
+
+#: src/prefs.c:1382
+msgid "Confirm exit from program"
+msgstr "Потврди излазак из програма"
+
+#: src/prefs.c:1385
+msgid ""
+"If activated, opens a dialog box to ask confirmation before exiting the "
+"program."
+msgstr ""
+"Уколико је активирано, отвара се окно за потврду пре изласка из програма."
+
+#: src/prefs.c:1388
+msgid "Confirm writing of file tag"
+msgstr "Потврди упис ознаке и датотеку"
+
+#: src/prefs.c:1392
+msgid "Confirm renaming of file"
+msgstr "Потврди преименовање датотеке"
+
+#: src/prefs.c:1396
+msgid "Confirm deleting of file"
+msgstr "Потврди брисање датотеке"
+
+#: src/prefs.c:1400
+msgid "Confirm writing of playlist"
+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:1422
+msgid "Apply changes (but don't save) and close this window"
+msgstr "Примени измене (али немој да их сачуваш) и затвори овај прозор"
+
+#: src/prefs.c:1431
+msgid "Close this window without saving"
+msgstr "Затвори овај прозор без чувања"
+
+#: src/prefs.c:1439
+msgid "Save changes and close this window"
+msgstr "Сачува измене и затвори прозор"
+
+#. For translators : be aware to NOT translate '%.*d' in this string
+#: src/prefs.c:1472
+#, c-format
+msgid "(Example : %.*d_-_Track_name_1.mp3)"
+msgstr "(Пример:%.*d_-_Име_нумере_1.mp3 )"
+
+#: src/prefs.c:1618
+msgid "Changes applied"
+msgstr "Измене су примењене"
+
+#: src/prefs.c:1637 src/setting.c:868
+msgid "Configuration saved"
+msgstr "Поставке су сачуване"
+
+#: src/prefs.c:1644
+msgid "Configuration unchanged"
+msgstr "Поставке нису мењане"
+
+#: src/prefs.c:1736
+#, c-format
+msgid ""
+" The selected path for 'Default path to files' isn't valid!\n"
+"'%s'\n"
+"(%s) "
+msgstr ""
+"Изабрана путања за подразумевану стазу до датотека није исправна!n„%s“\n"
+"(%s) "
+
+#: src/prefs.c:1738
+msgid "Not a directory"
+msgstr "Није директоријум"
+
+#: src/prefs.c:1839
+#, c-format
+msgid "The audio file player '%s' can't be found!"
+msgstr "Програм за репродукцију звука „%s“ није нађен!"
+
+#: src/scan.c:174
+msgid "Fill Tag"
+msgstr "Попуни ознаку"
+
+#: src/scan.c:175
+msgid "Rename File and Directory"
+msgstr "Преименуј датотеку и директоријум"
+
+#: src/scan.c:176
+msgid "Process Fields"
+msgstr "Обради поља"
+
+#: src/scan.c:353
+msgid "Tag successfully scanned..."
+msgstr "Ознака успешно скенирана..."
+
+#: src/scan.c:355
+#, c-format
+msgid "Tag successfully scanned...(%s)"
+msgstr "Ознака успешно скенирана... (%s)"
+
+#: src/scan.c:395
+#, c-format
+msgid ""
+"Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
+msgstr ""
+"Скенер ознака: чудно... екстензија „%s“ није нађена у имену датотеке „%s“!"
+
+#: src/scan.c:477 src/scan.c:506
+#, c-format
+msgid "Scan Error: can't find separator '%s' within '%s'"
+msgstr "Грешка скенера: не могу да нађем раздвајач „%s“ у „%s“"
+
+#: src/scan.c:663
+#, c-format
+msgid "Could not convert filename '%s' into system filename encoding."
+msgstr "Не могу да преведем име датотеке „%s“ у систем кодирања имена датотеке"
+
+#: src/scan.c:686
+msgid "New file name successfully scanned..."
+msgstr "Ново име датотеке успешно скенирано..."
+
+#: src/scan.c:689
+#, c-format
+msgid "New file name successfully scanned...(%s)"
+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:1909
+msgid "Tag and File Name scan"
+msgstr "Скенер ознака и имена датотека"
+
+#. Option Menu
+#: src/scan.c:1931
+msgid "Scanner:"
+msgstr "Скенер:"
+
+#. Selection of the item made at the end of the function
+#: src/scan.c:1953
+msgid "Select the type of scanner to use"
+msgstr "Изабери тип скенера за употребу"
+
+#: src/scan.c:1962
+msgid "Open scanner window / Scan selected files"
+msgstr "Отвори прозор скенера / Скенирај изабране датотеке"
+
+#: src/scan.c:1975
+msgid "Scanner Options"
+msgstr "Опције скенера"
+
+#: src/scan.c:1984
+msgid "Show / Hide Masks Editor"
+msgstr "Прикажи / Сакриј уређивач маски"
+
+#: src/scan.c:1994
+msgid "Show / Hide Legend"
+msgstr "Прикажи / Сакриј легенду"
+
+#: src/scan.c:2004
+msgid "Close this window"
+msgstr "Затвори овај прозор"
+
+#: src/scan.c:2032
+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:2058
+msgid "Fill tag preview..."
+msgstr "Преглед попуњавања ознаке..."
+
+#: src/scan.c:2085
+msgid "Prefix mask with current path"
+msgstr "Маска префикса са тренутном путањом"
+
+#: src/scan.c:2098
+msgid ""
+"Select or type in a mask using codes (see Legend) to parse tag fields. Used "
+"to rename the file.\n"
+"Use / to make directories. If the first character is /, it's a absolute "
+"path, otherwise is relative to the old path."
+msgstr ""
+"Изабери или унеси маску користећи кодове (види легенду) за прослеђивање "
+"пољима ознака. Користи се за преименовање датотека.\n"
+"Користи / за директоријуме. Уколико је први карактер /, путања је апсолутна, "
+"у супротној је релативна у односу на стару путању."
+
+#. Preview label
+#: src/scan.c:2125
+msgid "Rename file preview..."
+msgstr "Преглед преименовања датотеке..."
+
+#: src/scan.c:2145
+msgid "Select fields:"
+msgstr "Изабери поља:"
+
+#: src/scan.c:2148
+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:2151
+msgid "F"
+msgstr "Д"
+
+#: src/scan.c:2152
+msgid "Process file name field"
+msgstr "Обради поље за име датотеке."
+
+#. Advice for Translators : set the first letter of title translated
+#: src/scan.c:2154
+msgid "T"
+msgstr "Н"
+
+#: src/scan.c:2155
+msgid "Process title field"
+msgstr "Обради поље „Наслов“."
+
+#. Advice for Translators : set the first letter of artist translated
+#: src/scan.c:2157
+msgid "Ar"
+msgstr "И"
+
+#: src/scan.c:2158
+msgid "Process file artist field"
+msgstr "Обради поље „Извођач“."
+
+#. Advice for Translators : set the first letter of album translated
+#: src/scan.c:2160
+msgid "Al"
+msgstr "А"
+
+#: src/scan.c:2161
+msgid "Process album field"
+msgstr "Обради поље „Албум“."
+
+#. Advice for Translators : set the first letter of genre translated
+#: src/scan.c:2163
+msgid "G"
+msgstr "Ж"
+
+#: src/scan.c:2164
+msgid "Process genre field"
+msgstr "Обради поље „Жанр“."
+
+#. Advice for Translators : set the first letter of comment translated
+#: src/scan.c:2166
+msgid "Cm"
+msgstr "К"
+
+#: src/scan.c:2167
+msgid "Process comment field"
+msgstr "Обради поље „Коментар“."
+
+#. Advice for Translators : set the first letter of composer translated
+#: src/scan.c:2169
+msgid "Cp"
+msgstr "Кп"
+
+#: src/scan.c:2170
+msgid "Process composer field"
+msgstr "Обради поље „Композитор“."
+
+#. Advice for Translators : set the first letter of orig artist translated
+#: src/scan.c:2172
+msgid "O"
+msgstr "О"
+
+#: src/scan.c:2173
+msgid "Process original artist field"
+msgstr "Обради поље „Оригинални извођач“."
+
+#. Advice for Translators : set the first letter of copyright translated
+#: src/scan.c:2175
+msgid "Cr"
+msgstr "Ап"
+
+#: src/scan.c:2176
+msgid "Process copyright field"
+msgstr "Обради поље „Ауторско право“."
+
+#. Advice for Translators : set the first letter of URL translated
+#: src/scan.c:2178
+msgid "U"
+msgstr "У"
+
+#: src/scan.c:2179
+msgid "Process URL field"
+msgstr "Обради поље „УРЛ“."
+
+#. Advice for Translators : set the first letter of encoder name translated
+#: src/scan.c:2181
+msgid "E"
+msgstr "Кд"
+
+#: src/scan.c:2182
+msgid "Process encoder name field"
+msgstr "Обради поље „Кодирано поноћу“."
+
+#: src/scan.c:2228
+msgid "Invert Selection"
+msgstr "Изабери обратно"
+
+#: src/scan.c:2237
+msgid "Select/Unselect All."
+msgstr "Изабери све/ништа"
+
+#. Group: character conversion
+#: src/scan.c:2244
+msgid "Convert '_' and '%20' to ' '"
+msgstr "Преведи „_“ и „%20“ у „ “"
+
+#: src/scan.c:2250
+msgid "Convert:"
+msgstr "Преведи:"
+
+#: src/scan.c:2252
+msgid "to: "
+msgstr "у:"
+
+#: src/scan.c:2281
+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неком_пољу“ ће постати „Тексту неком пољу“."
+
+#: src/scan.c:2284
+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:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
+
+#: src/scan.c:2319
+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:2322
+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:2325
+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:2328
+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:2337
+msgid "Insert a space before an uppercase letter"
+msgstr "Уметни размак пре великог слова"
+
+#: src/scan.c:2338
+msgid "Remove duplicates of space or underscore"
+msgstr "Уклони дупле размаке или доње цртице"
+
+#: src/scan.c:2356
+msgid ""
+"All spaces between words are removed. Example, before: 'Text In An Entry', "
+"after: 'TextInAnEntry'."
+msgstr ""
+"Уклања све размаке између речи. На пример „Текст У Неком Пољу“ ће постати "
+"„ТекстУНекомПољу“."
+
+#: src/scan.c:2359
+msgid ""
+"A space is inserted before each upper case letter. Example, before: "
+"'TextInAnEntry', after: 'Text In An Entry'."
+msgstr ""
+"Додаје размак пре сваког великог слова. На пример „ТекстУНекомПољу“ ће "
+"постати „Текст У Неком Пољу“."
+
+#: src/scan.c:2362
+msgid ""
+"Duplicated spaces or underscores are removed. Example, before: "
+"'Text__In__An   Entry', after: 'Text_In_An Entry'."
+msgstr ""
+"Уклања дупле размаке или доње линије. На пример „Текст__У__Неком  Пољу“ ће "
+"постати „Текст_У_Неком Пољу“."
+
+#.
+#. * Frame to display codes legend
+#.
+#: src/scan.c:2368
+msgid "Legend"
+msgstr "Легенда"
+
+#: src/scan.c:2374
+#, c-format
+msgid "%a : artist"
+msgstr "%a : извођач"
+
+#: src/scan.c:2377
+msgid "%b : album"
+msgstr "%b : албум"
+
+#: src/scan.c:2380
+#, c-format
+msgid "%c : comment"
+msgstr "%c : коментар"
+
+#: src/scan.c:2383
+#, c-format
+msgid "%p : composer"
+msgstr "%p : композитор"
+
+#: src/scan.c:2386
+msgid "%r : copyright"
+msgstr "%r : ауторско право"
+
+#: src/scan.c:2389
+#, c-format
+msgid "%d : disc number"
+msgstr "%d : број ЦД-а"
+
+#: src/scan.c:2392
+#, c-format
+msgid "%e : encoded by"
+msgstr "%e : кодирано помоћу"
+
+#: src/scan.c:2395
+#, c-format
+msgid "%g : genre"
+msgstr "%g : жанр"
+
+#: src/scan.c:2398
+#, c-format
+msgid "%i : ignored"
+msgstr "%i : игнорисано"
+
+#: src/scan.c:2401
+msgid "%l : number of tracks"
+msgstr "%l : број нумера"
+
+#: src/scan.c:2404
+#, c-format
+msgid "%o : orig. artist"
+msgstr "%o : ориг. ивођач"
+
+#: src/scan.c:2407
+#, c-format
+msgid "%n : track"
+msgstr "%n : нумера"
+
+#: src/scan.c:2410
+msgid "%t : title"
+msgstr "%t : наслов"
+
+#: src/scan.c:2413
+#, c-format
+msgid "%u : URL"
+msgstr "%u : УРЛ"
+
+#: src/scan.c:2416
+msgid "%y : year"
+msgstr "%y : година"
+
+#.
+#. * Masks Editor
+#.
+#: src/scan.c:2423
+msgid "Mask Editor"
+msgstr "Уређивач маски"
+
+#: src/scan.c:2480
+msgid "Create New Mask"
+msgstr "Направи нову маску"
+
+#: src/scan.c:2490
+msgid "Move Up this Mask"
+msgstr "Помери маску нагоре"
+
+#: src/scan.c:2500
+msgid "Move Down this Mask"
+msgstr "Помери маску надоле"
+
+#: src/scan.c:2510
+msgid "Duplicate Mask"
+msgstr "Размножи маску"
+
+#: src/scan.c:2520
+msgid "Add Default Masks"
+msgstr "Додај подразумевану маску"
+
+#: src/scan.c:2530
+msgid "Remove Mask"
+msgstr "Уклони маску"
+
+#: src/scan.c:2540
+msgid "Save Masks"
+msgstr "Сачувај маску"
+
+#: src/scan.c:3117
+msgid "New_mask"
+msgstr "Нова _маска"
+
+#: src/scan.c:3155
+msgid "Copy: No row selected!"
+msgstr "Умножи: Није изабран ред!"
+
+#: src/scan.c:3259
+msgid "Remove: No row selected!"
+msgstr "Уклони: Није изабран ред!"
+
+#: src/scan.c:3306
+msgid "Move Up: No row selected!"
+msgstr "Помери нагоре: Није изабран ред!"
+
+#: src/scan.c:3359
+msgid "Move Down: No row selected!"
+msgstr "Помери надоле: Није изабран ред!"
+
+#: src/setting.c:889
+#, c-format
+msgid "ERROR: Can't write config file: %s (%s)"
+msgstr "Грешка: Не могу да упишем датотеку са поставкама: %s (%s)"
+
+#: src/setting.c:1032 src/setting.c:1069
+#, c-format
+msgid "Can't open configuration file '%s' (%s)"
+msgstr "Не могу да отворим датотеку са поставкама „%s“ (%s)"
+
+#: src/setting.c:1033
+msgid "Loading default configuration..."
+msgstr "Учитавам подразумеване поставке..."
+
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
+#, c-format
+msgid "Can't create or open file '%s' (%s)"
+msgstr "Не могу да направим или отворим датотеку „%s“ (%s)"
+
+#: src/setting.c:1278
+#, c-format
+msgid "ERROR: Can't write list to file: %s (%s)"
+msgstr "Грешка: Не могу да упишем листу у датотеку: %s (%s)"
+
+#. Fall back to defaults
+#: src/setting.c:1358
+msgid "Loading default 'Fill Tag' masks..."
+msgstr "Учитавам подразумеване маске за „Попуни ознаку“..."
+
+#. Fall back to defaults
+#: src/setting.c:1386
+msgid "Loading default 'Rename File' masks..."
+msgstr "Учитавам подразумеване маске за „Преименуј датотеку“..."
+
+#. Fall back to defaults
+#: src/setting.c:1413
+msgid "Loading default 'Rename Directory' masks..."
+msgstr "Учитавам подразумеване маске за „Преименуј директоријум“..."
+
+#: src/setting.c:1606
+msgid "ERROR: The environment variable HOME is not defined!"
+msgstr "Грешка: Промењљива окружења „HOME“ није одређена!"
+
+#: src/setting.c:1622
+#, c-format
+msgid "ERROR: Can't create directory '%s' (%s)!"
+msgstr "Грешка: Не могу да направим директоријум „%s“ (%s)!"
+
+#: src/vcedit.c:287
+msgid "Input truncated or empty."
+msgstr "Улаз је цкраћен или празан."
+
+#: src/vcedit.c:289
+msgid "Input is not an Ogg bitstream."
+msgstr "Улаз није Ogg битски ток."
+
+#: src/vcedit.c:307
+msgid "Error reading first page of Ogg bitstream."
+msgstr "Грешка при читању прве стране Ogg битског тома."
+
+#: src/vcedit.c:313
+msgid "Error reading initial header packet."
+msgstr "Грешка при читању почетног пакета заглавља."
+
+#: src/vcedit.c:341
+msgid "Ogg bitstream contains neither speex or vorbis data."
+msgstr "Ogg битски ток не задржи ни speex ни vorbis податке."
+
+#: src/vcedit.c:375
+msgid "Corrupt secondary header."
+msgstr "Оштећено секундарно заглавље."
+
+#: src/vcedit.c:405
+msgid "Need to save extra headers - TODO!!"
+msgstr "Потребно је да сачувам додатно заглавље - НЕДОВРШЕНО!"
+
+#: src/vcedit.c:419
+msgid "EOF before end of vorbis headers."
+msgstr "Крај датотеке пре краја vorbis заглавља."
+
+#: src/vcedit.c:584
+msgid "Corrupt or missing data, continuing..."
+msgstr "Оштећени или непостојећи подаци, настављам..."
+
+#: src/vcedit.c:621
+msgid ""
+"Error writing stream to output. Output stream may be corrupted or truncated."
+msgstr ""
+"Грешка при упису тока у излаз. Излазни ток је можда оштећен или скраћен."
+
+#. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
+#: src/win32/win32dep.c:177
+#, c-format
+msgid "DLL '%s' not found. Try loading it..."
+msgstr "DLL „%s“ није нађен. Покушајте да га учитате..."
+
+#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
+#: src/win32/win32dep.c:182
+#, c-format
+msgid "DLL '%s' could not be loaded"
+msgstr "DLL „%s“ не може бити учитан"
+
+#. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
+#: src/win32/win32dep.c:193
+#, c-format
+msgid "This version of '%s' contains '%s'"
+msgstr "Ова верзија „%s“-а садржи „%s“"
+
+#. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
+#: src/win32/win32dep.c:200
+#, c-format
+msgid "Function '%s' not found in dll '%s'"
+msgstr "Функција „%s“ није нађена у dll „%s“"
+
+#. Log_Print(_("Audio player: '%s'"), player);
+#: src/win32/win32dep.c:294
+#, c-format
+msgid "Audio player: '%s'"
+msgstr "Програм за репродукцију звука: „%s“"
+
+#. ET_Win32_Path_Replace_Backslashes(app_data_dir);
+#. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
+#: src/win32/win32dep.c:434
+#, c-format
+msgid "EasyTAG settings dir: '%s'"
+msgstr "Директоријум са поставкама: „%s“"
+
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Изабрана путања је погрешна!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Разликуј велика и мала лова"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Замени карактер неким другим."
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Учитан садржај датотеке :"
+
+#~ msgid "Files Name List :"
+#~ msgstr "Листа имена датотека:"
+
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(MP3 датотеке подржане кроз: libid3tag %s)"
+
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(ID3v2.3 ознаке подржане кроз: id3lib %d.%d.%d)"
diff --git a/po/sr@Latn.gmo b/po/sr@Latn.gmo
new file mode 100644
index 0000000..1a74c8b
--- /dev/null
+++ b/po/sr@Latn.gmo
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
new file mode 100644
index 0000000..335f560
--- /dev/null
+++ b/po/sr@Latn.po
@@ -0,0 +1,5006 @@
+# Serbian translation of EasyTAG
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the EasyTAG package.
+# Miloš Popović <gpopac@gmail.com>, 2007.

+#
+msgid ""
+msgstr ""
+"Project-Id-Version: EasyTAG-2.1.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
+"PO-Revision-Date: 2007-09-04 09:53+0100\n"
+"Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
+"Language-Team: Serbian <gnom@prevod.org>\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"
+"X-Poedit-Language: Serbian\n"
+"X-Poedit-Country: SERBIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: src/about.c:134
+msgid ""
+"    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
+"Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
+"GTK+ interface makes tagging easier under GNU/Linux."
+msgstr ""
+"    EasyTAG je alat za pregled i uređivanje oznaka u MP3, MP2, FLAC, Ogg "
+"Vorbis, MP4/AAC, MusePack i Monkey audio datotekama. Njegovo jednostavno i "
+"lepo GTK+ okruženje čini označavanje u GNU/Linuksu sistemima lakšim."
+
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+msgid "(German translation)"
+msgstr "(Nemački prevod)"
+
+#: src/about.c:146 src/about.c:147
+msgid "(Russian translation)"
+msgstr "(Ruski prevod)"
+
+#: src/about.c:148 src/about.c:149
+msgid "(Dutch translation)"
+msgstr "(Holandski prevod)"
+
+#: src/about.c:150 src/about.c:151
+msgid "(Swedish translation)"
+msgstr "(Švetski prevod)"
+
+#: src/about.c:152 src/about.c:153 src/about.c:154
+msgid "(Hungarian translation)"
+msgstr "(Mađarski translation)"
+
+#: src/about.c:155 src/about.c:156
+msgid "(Italian translation)"
+msgstr "(Italijanski prevod)"
+
+#: src/about.c:157
+msgid "(Japanese translation)"
+msgstr "(Japanski prevod)"
+
+#: src/about.c:158 src/about.c:159
+msgid "(Ukrainian translation)"
+msgstr "(Ukrainski prevod)"
+
+#: src/about.c:160 src/about.c:161
+msgid "(Czech translation)"
+msgstr "(Češki prevod)"
+
+#: src/about.c:162 src/about.c:163 src/about.c:164
+msgid "(Spanish translation)"
+msgstr "(Španski prevod)"
+
+#: src/about.c:165
+msgid "(Polish translation)"
+msgstr "(Poljski prevod)"
+
+#: src/about.c:166
+msgid "(Romanian translation)"
+msgstr "(Rumunski prevod)"
+
+#: src/about.c:167
+msgid "(Danish translation)"
+msgstr "(Danski prevod)"
+
+#: src/about.c:168
+msgid "(Greek translation)"
+msgstr "(Grčki prevod)"
+
+#: src/about.c:169
+msgid "(Brazilian Portuguese translation)"
+msgstr "(Brazilsko-portugalski prevod)"
+
+#: src/about.c:170
+msgid "(Bulgarian translation)"
+msgstr "(Bugarski prevod)"
+
+#: src/about.c:171
+msgid "(Chinese translation)"
+msgstr "(Kineski prevod)"
+
+#: src/about.c:172
+msgid "(Hebrew translation)"
+msgstr "(Hebrejski prevod)"
+
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(Nemački prevod)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Komentar"
+
+#. Config
+#: src/about.c:244
+msgid "About..."
+msgstr "O programu..."
+
+#.
+#. * Tab for common informations
+#.
+#: src/about.c:262 src/bar.c:236
+msgid "About"
+msgstr "O programu"
+
+#: src/about.c:293
+#, c-format
+msgid "(compiled: %s)"
+msgstr "(Preveo: %s)"
+
+#: src/about.c:297
+#, c-format
+msgid "(using: GTK+ %d.%d.%d)"
+msgstr "(Koristi: GTK+ %d.%d.%d)"
+
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "Autor: %s"
+
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "Mejl adresa: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Internet stranica: "
+
+#: src/about.c:328
+msgid "Description:"
+msgstr "Opis:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
+#, fuzzy
+msgid "MP3 file support"
+msgstr "(Podrška za MP3 datoteke je isključena)"
+
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
+#, c-format
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
+msgstr "(ID3v2.3 oznake su isključene)"
+
+#: src/about.c:410
+#, fuzzy
+msgid "available"
+msgstr "Nemate dostupnu memoriju"
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
+msgstr "(Podrška za Ogg Vorbis datoteke je isključena)"
+
+#: src/about.c:430
+#, fuzzy
+msgid "Speex file support"
+msgstr "(Podrška za Speex datoteke je isključena)"
+
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
+msgstr "(Podrška za FLAC datoteke je isključena)"
+
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
+msgstr "(Podrška za MP4/AAC datoteke je isključena)"
+
+#: src/about.c:460
+#, fuzzy
+msgid "WavPack file support"
+msgstr "(Podrška za WavPack datoteke je isključena)"
+
+#.
+#. * Tab for thanks
+#.
+#: src/about.c:473
+msgid "Thanks"
+msgstr "Zahvalnost"
+
+#: src/about.c:493
+msgid "Translations:\n"
+msgstr "Prevodi:\n"
+
+#: src/about.c:521
+msgid "General:\n"
+msgstr "Opšte:\n"
+
+#: src/about.c:538
+msgid "Changes"
+msgstr "Promene"
+
+#: src/about.c:560
+#, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
+#: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
+#, c-format
+msgid "ERROR while opening file: '%s' (%s)."
+msgstr "Greška pri otvaranju datoteke: „%s“ (%s)."
+
+#.
+#. * Main Menu Actions
+#.
+#: src/bar.c:146
+msgid "_File"
+msgstr "_Datoteka"
+
+#: src/bar.c:147
+msgid "Sort list by tag"
+msgstr "Sortiraj listu po oznaci"
+
+#: src/bar.c:148
+msgid "Sort list by property"
+msgstr "Sortiraj listu po svojstvu datoteke"
+
+#: src/bar.c:149
+msgid "Ascending by filename"
+msgstr "Rastuće, po imenu datoteke"
+
+#: src/bar.c:150
+msgid "Descending by filename"
+msgstr "Opadajuće, po imenu datoteke"
+
+#: src/bar.c:151
+msgid "Ascending by creation date"
+msgstr "Rastuće, po datumu nastanka"
+
+#: src/bar.c:152
+msgid "Descending by creation date"
+msgstr "Opadajuće, po datumu nastanka"
+
+#: src/bar.c:153
+msgid "Ascending by track number"
+msgstr "Rastuće, po broju numere"
+
+#: src/bar.c:154
+msgid "Descending by track number"
+msgstr "Opadajuće, po broju numere"
+
+#: src/bar.c:155
+msgid "Ascending by title"
+msgstr "Rastuće, po naslovu"
+
+#: src/bar.c:156
+msgid "Descending by title"
+msgstr "Opadajuće, po naslovu"
+
+#: src/bar.c:157
+msgid "Ascending by artist"
+msgstr "Rastuće, po izvođaču"
+
+#: src/bar.c:158
+msgid "Descending by artist"
+msgstr "Opadajuće, po izvođaču"
+
+#: src/bar.c:159
+msgid "Ascending by album"
+msgstr "Rastuće, po albumu"
+
+#: src/bar.c:160
+msgid "Descending by album"
+msgstr "Opadajuće, po albumu"
+
+#: src/bar.c:161
+msgid "Ascending by year"
+msgstr "Rastuće, po godini"
+
+#: src/bar.c:162
+msgid "Descending by year"
+msgstr "Opadajuće, po godini"
+
+#: src/bar.c:163
+msgid "Ascending by genre"
+msgstr "Rastuće, po žanru"
+
+#: src/bar.c:164
+msgid "Descending by genre"
+msgstr "Opadajuće, po žanru"
+
+#: src/bar.c:165
+msgid "Ascending by comment"
+msgstr "Rastuće, po komentaru"
+
+#: src/bar.c:166
+msgid "Descending by comment"
+msgstr "Opadajuće, po komentaru"
+
+#: src/bar.c:167
+msgid "Ascending by composer"
+msgstr "Rastuće, po kompozitoru"
+
+#: src/bar.c:168
+msgid "Descending by composer"
+msgstr "Opadajuće, po kompozitoru"
+
+#: src/bar.c:169
+msgid "Ascending by original artist"
+msgstr "Rastuće, po originalnom izvođaču"
+
+#: src/bar.c:170
+msgid "Descending by original artist"
+msgstr "Opadajuće, po originalnom izvođaču"
+
+#: src/bar.c:171
+msgid "Ascending by copyright"
+msgstr "Rastuće, po autorskim pravima"
+
+#: src/bar.c:172
+msgid "Descending by copyright"
+msgstr "Opadajuće, po autorskim pravima"
+
+#: src/bar.c:173
+msgid "Ascending by URL"
+msgstr "Rastuće, po URL"
+
+#: src/bar.c:174
+msgid "Descending by URL"
+msgstr "Opadajuće, po URL"
+
+#: src/bar.c:175
+msgid "Ascending by encoder name"
+msgstr "Rastuće, po imenu kodera"
+
+#: src/bar.c:176
+msgid "Descending by encoder name"
+msgstr "Opadajuće, po imenu kodera"
+
+#: src/bar.c:177
+msgid "Ascending by file type"
+msgstr "Rastuće, po tipu datoteke"
+
+#: src/bar.c:178
+msgid "Descending by file type"
+msgstr "Opadajuće, po tipu datoteke"
+
+#: src/bar.c:179
+msgid "Ascending by file size"
+msgstr "Rastuće, po veličini datoteke"
+
+#: src/bar.c:180
+msgid "Descending by file size"
+msgstr "Opadajuće, po veličini datoteke"
+
+#: src/bar.c:181
+msgid "Ascending by duration"
+msgstr "Rastuće, po dužini numere"
+
+#: src/bar.c:182
+msgid "Descending by duration"
+msgstr "Opadajuće, po dužini numere"
+
+#: src/bar.c:183
+msgid "Ascending by bitrate"
+msgstr "Rastuće, po bitskom protoku"
+
+#: src/bar.c:184
+msgid "Descending by bitrate"
+msgstr "Opadajuće, po bitskom protoku"
+
+#: src/bar.c:185
+msgid "Ascending by samplerate"
+msgstr "Rastuće po učestanosti toka"
+
+#: src/bar.c:186
+msgid "Descending by samplerate"
+msgstr "Opadajuće, po učestanosti toka"
+
+#: src/bar.c:188
+msgid "Open File(s) with ..."
+msgstr "Otvori datoteku(e) sa..."
+
+#: src/bar.c:189 src/cddb.c:325
+msgid "Select All Files"
+msgstr "Izaberi sve datoteke"
+
+#: src/bar.c:190
+msgid "Unselect All Files"
+msgstr "Otpusti sve datoteke"
+
+#: src/bar.c:191 src/cddb.c:332
+msgid "Invert Files Selection"
+msgstr "Obrnuto izaberi datoteke"
+
+#: src/bar.c:192
+msgid "Delete File(s)"
+msgstr "Ukloni datoteku(e)"
+
+#: src/bar.c:193
+msgid "_First File"
+msgstr "P_rva datoteka"
+
+#: src/bar.c:193
+msgid "First File"
+msgstr "Prva datoteka"
+
+#: src/bar.c:194
+msgid "_Previous File"
+msgstr "Pr_ethodna datoteka"
+
+#: src/bar.c:194
+msgid "Previous File"
+msgstr "Prethodna datoteka"
+
+#: src/bar.c:195
+msgid "_Next File"
+msgstr "_Naredna datoteka"
+
+#: src/bar.c:195
+msgid "Next File"
+msgstr "Naredna datoteka"
+
+#: src/bar.c:196
+msgid "_Last File"
+msgstr "Po_slednja datoteka"
+
+#: src/bar.c:196
+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
+msgid "S_can File(s)"
+msgstr "S_keniraj datoteku(e)"
+
+#: src/bar.c:199
+msgid "Scan File(s)"
+msgstr "Skeniraj datoteku(e)"
+
+#: src/bar.c:200
+msgid "_Remove Tag(s)"
+msgstr "_Ukloni oznaku(e)"
+
+#: src/bar.c:200
+msgid "Remove Tag(s)"
+msgstr "Ukloni oznaku(e)"
+
+#: src/bar.c:201
+msgid "_Undo Last File(s) Changes"
+msgstr "_Opozovi poslednje izmene datoteke(a)"
+
+#: src/bar.c:201
+msgid "Undo Last File(s) Changes"
+msgstr "Opozovi poslednje izmene datoteke(a)"
+
+#: src/bar.c:202
+msgid "R_edo Last File(s) Changes"
+msgstr "_Ponovi poslednje izmene datoteke(a)"
+
+#: src/bar.c:202
+msgid "Redo Last File(s) Changes"
+msgstr "Ponovi poslednje izmene datoteke(a)"
+
+#: src/bar.c:203
+msgid "_Save File(s)"
+msgstr "_Sačuvaj datoteku(e)"
+
+#: src/bar.c:203
+msgid "Save File(s)"
+msgstr "Sačuvaj datoteku(e)"
+
+#: src/bar.c:204
+msgid "_Force Saving File(s)"
+msgstr "Pri_moraj čuvanje datoteke(a)"
+
+#: src/bar.c:204
+msgid "Force Saving File(s)"
+msgstr "Primoraj čuvanje datoteke(a)"
+
+#: src/bar.c:205
+msgid "Undo Last Changes"
+msgstr "Opozovi poslednje izmene"
+
+#: src/bar.c:206
+msgid "Redo Last Changes"
+msgstr "Ponovi poslednje izmene"
+
+#: src/bar.c:207
+msgid "_Quit"
+msgstr "_Izađi"
+
+#: src/bar.c:207
+msgid "Quit"
+msgstr "Izađi"
+
+#: src/bar.c:209
+msgid "_Browser"
+msgstr "P_regledač"
+
+#: src/bar.c:210
+msgid "Go to _Home Directory"
+msgstr "Idi u _lični direktorijum"
+
+#: src/bar.c:210
+msgid "Go to Home Directory"
+msgstr "Idi u lični direktorijum"
+
+#: src/bar.c:211
+msgid "Go to _Default Directory"
+msgstr "Idi u po_drazumevani direktorijum"
+
+#: src/bar.c:211
+msgid "Go to Default Directory"
+msgstr "Idi u podrazumevani direktorijum"
+
+#: src/bar.c:212
+msgid "Set _Current Path as Default"
+msgstr "Postavi _trenutnu putanju kao podrazumevanu"
+
+#: src/bar.c:212
+msgid "Set Current Path as Default"
+msgstr "Postavi trenutnu putanju kao podrazumevanu"
+
+#: src/bar.c:213
+msgid "Tree View | Artist-Album View"
+msgstr "Pregled u stablu | Pregled Izvođač-Album"
+
+#: src/bar.c:214
+msgid "Rename Directory ..."
+msgstr "Preimenuj direktorijum..."
+
+#: src/bar.c:215
+msgid "Reload Directory"
+msgstr "Osveži direktorijum"
+
+#: src/bar.c:216 src/browser.c:3641
+msgid "Browse Directory with ..."
+msgstr "Otvori direktorijum sa..."
+
+#: src/bar.c:217
+msgid "_Collapse Tree"
+msgstr "_Sakupi stablo"
+
+#: src/bar.c:218
+msgid "_Refresh Tree"
+msgstr "_Osveži stablo"
+
+#: src/bar.c:220 src/bar.c:249
+msgid "S_canner"
+msgstr "S_kener"
+
+#: src/bar.c:221
+msgid "_Fill Tag(s) ..."
+msgstr "_Ispuni oznaku(e)"
+
+#: src/bar.c:221
+msgid "Fill Tag(s) ..."
+msgstr "Ispuni oznaku(e)"
+
+#: src/bar.c:222
+msgid "_Rename File(s) and Directory ..."
+msgstr "P_reimenuj datoteku(e) u direktorijum..."
+
+#: src/bar.c:222
+msgid "Rename File(s) and Directory ..."
+msgstr "Preimenuj datoteku(e) i direktorijum"
+
+#: src/bar.c:223
+msgid "_Process Field(s) ..."
+msgstr "_Obradi polje(a)..."
+
+#: src/bar.c:223
+msgid "Process Fields(s) ..."
+msgstr "Obradi polje(a)..."
+
+#: src/bar.c:225
+msgid "_Misc"
+msgstr "_Ostalo"
+
+#: src/bar.c:226
+msgid "Search _File(s) ..."
+msgstr "_Traži datoteku(e)..."
+
+#: src/bar.c:226
+msgid "Search File(s)..."
+msgstr "Traži datoteku(e)..."
+
+#: src/bar.c:227
+msgid "CD Data _Base Search ..."
+msgstr "Pretraga _baze CD podataka..."
+
+#: src/bar.c:227
+msgid "CDDB Search ..."
+msgstr "CD baza, traži..."
+
+#: src/bar.c:228
+msgid "Load Filenames from TXT ..."
+msgstr "Učitaj imena datoteka iz .txt datoteke..."
+
+#: src/bar.c:229
+msgid "Write Playlist ..."
+msgstr "Načini listu numera..."
+
+#: src/bar.c:230 src/bar.c:250 src/bar.c:251 src/bar.c:252
+msgid "Run Audio Player"
+msgstr "Pokreni program za reprodukciju zvuka"
+
+#: src/bar.c:232
+msgid "_Settings"
+msgstr "Pode_šavanja"
+
+#: src/bar.c:233
+msgid "_Preferences ..."
+msgstr "_Postavke..."
+
+#: src/bar.c:233
+msgid "Preferences ..."
+msgstr "Postavke..."
+
+#: src/bar.c:235
+msgid "_Help"
+msgstr "_Pomoć"
+
+#: src/bar.c:236
+msgid "_About"
+msgstr "_O programu"
+
+#.
+#. * Following items are on toolbar but not on menu
+#.
+#: src/bar.c:242
+msgid "Stop the current action"
+msgstr "Prekini trenutni zadatak"
+
+#.
+#. * Popup menu's Actions
+#.
+#: src/bar.c:248
+msgid "_File Operations"
+msgstr "_Operacije nad datotekama"
+
+#: src/bar.c:253
+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:257
+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:264
+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:267
+msgid "Show Hidden Directories"
+msgstr "Prikaži skrivene direktorijume"
+
+#: src/bar.c:269
+msgid "Show tree browser / Display by Artist and Album"
+msgstr "Prikaži stablo datoteka / Prikaži izvođača i album"
+
+#: src/bar.c:306
+#, c-format
+msgid "Could not merge UI, error was: %s\n"
+msgstr "Ne mogu da spojim UI, greška: %s\n"
+
+#: src/bar.c:406
+msgid "Ready to start..."
+msgstr "Sve je spremno za početak..."
+
+#: src/browser.c:326
+msgid "New default path for files selected"
+msgstr "Izabrana je nova podrazumevana putanja za datoteke"
+
+#. Some files haven't been saved
+#. Some files aren't saved
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
+msgid "Confirm..."
+msgstr "Potvrdi..."
+
+#: src/browser.c:713
+msgid ""
+"Some files have been modified but not saved...\n"
+"Do you want to save them before changing the directory?"
+msgstr ""
+"Neke datoteke su izmenjene, ali nisu sačuvane...\n"
+"Da li želite da ih sačuvate pre promene direktorijuma?"
+
+#: src/browser.c:2040
+msgid "<All albums>"
+msgstr "<Svi albumi>"
+
+#: src/browser.c:2434
+#, 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:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+msgid "Artist"
+msgstr "Izvođač"
+
+#: src/browser.c:2801
+msgid "# Albums"
+msgstr "#Albumi"
+
+#: src/browser.c:2801 src/browser.c:2802
+msgid "# Files"
+msgstr "#Datoteke"
+
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
+msgid "Album"
+msgstr "Album"
+
+#: src/browser.c:2822
+msgid "Go to parent directory"
+msgstr "Idi u roditeljski direktorijum"
+
+#: src/browser.c:2839
+msgid "Enter a directory to browse."
+msgstr "Unesi direktorijum za pretragu."
+
+#: src/browser.c:2914
+msgid "Tree"
+msgstr "Stablo"
+
+#: src/browser.c:2957
+msgid "Artist & Album"
+msgstr "Izvođač i album"
+
+#: src/browser.c:3206
+msgid "Rename the directory"
+msgstr "Preimenuj direktorijum"
+
+#: src/browser.c:3222
+#, c-format
+msgid "Rename the directory '%s' to : "
+msgstr "Preimenuj direktorijum „%s“ u:"
+
+#: src/browser.c:3241 src/misc.c:1342
+msgid "Use mask :"
+msgstr "Koristi masku:"
+
+#: src/browser.c:3244
+msgid "If activated, it will use masks to rename directory."
+msgstr "Ukolik je aktivno, koristiće maske za preimenovanje direktorijuma."
+
+#: src/browser.c:3263
+msgid ""
+"Select or type in a mask using codes (see Legend in Scanner Window) to "
+"rename the directory from tag fields."
+msgstr ""
+"Izaberi ili upiši masku u obliku kodova (vidi legendu u prozoru skenera) za "
+"preimenovanje direktorijuma iz polja oznaka."
+
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
+msgid "Invalid Scanner Mask"
+msgstr "Neispravna maska skenera"
+
+#. Preview label
+#: src/browser.c:3289
+msgid "Rename directory preview..."
+msgstr "Pregled preimenovanja direktorijuma..."
+
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Greška..."
+
+#: src/browser.c:3405
+msgid "You must type a directory name!"
+msgstr "Morate da unesete ime direktorijuma!"
+
+#: src/browser.c:3420
+#, c-format
+msgid "Could not convert '%s' into filename encoding. Please use another name."
+msgstr ""
+"Ne mogu da prevedem „%s“ u kodiranje za ime datoteke. Koristite drugo ime."
+
+#. TODO
+#. // The same directory already exists. So we ask if we want to move the files
+#. msg = g_strdup_printf(_("The directory already exists!\n(%s)\nDo you want "
+#. "to move the files?"),new_path_utf8);
+#. msgbox = msg_box_new(_("Confirm..."),msg,GTK_STOCK_DIALOG_QUESTION,
+#. BUTTON_NO,BUTTON_YES,0);
+#. g_free(msg);
+#. msg_box_hide_check_button(MSG_BOX(msgbox));
+#. button = msg_box_run(MSG_BOX(msgbox));
+#. gtk_widget_destroy(msgbox);
+#.
+#. switch (button)
+#. {
+#. case BUTTON_YES:
+#. // Here we must rename all files with the new location, and remove the directory
+#.
+#. Rename_File ()
+#.
+#. break;
+#. case BUTTON_NO:
+#. break;
+#. }
+#: src/browser.c:3478
+#, c-format
+msgid ""
+"Can't rename because this directory name already exists!\n"
+"(%s)"
+msgstr ""
+"Ne mogu da preimenujem jer direktorijum sa tim imenom već postoji!\n"
+"(%s)"
+
+#: src/browser.c:3513 src/browser.c:3539
+#, c-format
+msgid ""
+"Can't rename directory \n"
+"'%s'\n"
+" to \n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"Ne mogu da preimenujem direktorijum \n"
+"„%s“\n"
+" to \n"
+"„%s“!\n"
+"(%s)"
+
+#: src/browser.c:3582
+msgid "Directory renamed"
+msgstr "Direktorijum preimenovan"
+
+#: src/browser.c:3660 src/browser.c:3820
+msgid "Program to run :"
+msgstr "Program za pokretanje:"
+
+#: src/browser.c:3672
+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:3801
+msgid "Open File with ..."
+msgstr "Otvori datoteku sa..."
+
+#: src/browser.c:3832
+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:3985
+msgid "You must type a program name!"
+msgstr "Morate uneti ime programa!"
+
+#: src/browser.c:3998 src/misc.c:942
+#, c-format
+msgid "The program '%s' can't be found!"
+msgstr "Program „%s“ nije nađen!"
+
+#: src/browser.c:4047 src/misc.c:988
+#, c-format
+msgid "Can't execute %s (error %d)!\n"
+msgstr "Ne mogu da pokrenem %s (greška %d)!\n"
+
+#: src/browser.c:4066 src/misc.c:1027
+msgid "Can't fork another process!\n"
+msgstr "Ne mogu da razgranam u još jedan proces!\n"
+
+#: src/browser.c:4100
+#, c-format
+msgid "Executed command : '%s %s'"
+msgstr "Izvršena komanda : „%s %s“"
+
+#: src/cddb.c:228
+msgid "Artist / Album"
+msgstr "Izvođač / Album"
+
+#: 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:229 src/cddb.c:438
+msgid "Track Name"
+msgstr "Naslov numere"
+
+#: src/cddb.c:229
+msgid "Time"
+msgstr "Vreme"
+
+#: 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:272
+msgid "Automatic Search"
+msgstr "Automatska pretraga"
+
+#: src/cddb.c:284
+msgid "Request CD database :"
+msgstr "Zatraži CD bazu :"
+
+#: src/cddb.c:294
+msgid ""
+"Request automatically the CDDB database using the selected files (the order "
+"is important!) to generate the CddbID."
+msgstr ""
+"Pretražuje automatski CD bazu koristeći izabrane datoteke (redosled je "
+"važan!) da bi načinio CD identifikacioni kod."
+
+#: src/cddb.c:304 src/cddb.c:414
+msgid "Stop the search ..."
+msgstr "Prekini pretragu..."
+
+#. Check box to run the scanner
+#: src/cddb.c:311
+msgid "Use local Cddb"
+msgstr "Koristi lokalnu CD bazu"
+
+#: src/cddb.c:314 src/cddb.c:768
+msgid ""
+"When activating this option, after loading the fields, the current selected "
+"scanner will be ran (the scanner window must be opened)."
+msgstr ""
+"Nakon aktiviranja ove opcije, posle učitavanja polja, trenutno odabrani "
+"skener će biti pokrenut (prozor skenera mora biti otvoren)."
+
+#.
+#. * 2 - Page for manual search
+#.
+#: src/cddb.c:359
+msgid "Manual Search"
+msgstr "Ručna pretraga"
+
+#: src/cddb.c:374
+msgid "Words :"
+msgstr "Reči :"
+
+#: 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:426
+msgid "Search In :"
+msgstr "Traži u :"
+
+#: src/cddb.c:434
+msgid "All Fields"
+msgstr "Sva polja"
+
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+msgid "Other"
+msgstr "Ostalo"
+
+#: src/cddb.c:461
+msgid "All Categories"
+msgstr "Sve kategorije"
+
+#: src/cddb.c:463
+msgid "Blues"
+msgstr "Bluz"
+
+#: src/cddb.c:464
+msgid "Classical"
+msgstr "Klasika"
+
+#: src/cddb.c:465
+msgid "Country"
+msgstr "Kantri"
+
+#: src/cddb.c:466
+msgid "Folk"
+msgstr "Golk"
+
+#: src/cddb.c:467
+msgid "Jazz"
+msgstr "Džez"
+
+#.
+#. * Misc
+#.
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+msgid "Misc"
+msgstr "Ostalo"
+
+#: src/cddb.c:469
+msgid "Newage"
+msgstr "Novi talas"
+
+#: src/cddb.c:470
+msgid "Reggae"
+msgstr "Rege"
+
+#: src/cddb.c:471
+msgid "Rock"
+msgstr "Rok"
+
+#: src/cddb.c:472
+msgid "Soundtrack"
+msgstr "Zvučna traka"
+
+#: 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:510
+msgid "movies, shows"
+msgstr "filmovi, kabare"
+
+#: 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:514
+msgid " Categories "
+msgstr "Kategorije"
+
+#.
+#. * Results command
+#.
+#: src/cddb.c:522
+msgid "Results :"
+msgstr "Rezultati :"
+
+#: src/cddb.c:529 src/misc.c:2012
+msgid "Search :"
+msgstr "Traži :"
+
+#: 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:554
+msgid "Search Next"
+msgstr "Traži sledeće"
+
+#: src/cddb.c:560
+msgid "Search Previous"
+msgstr "Traži prethodno"
+
+#: 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:577 src/cddb.c:1503
+msgid "Unselect all lines"
+msgstr "Otpusti sve redove"
+
+#: src/cddb.c:583
+msgid "Invert lines selection"
+msgstr "Obrnuto izaberi redove"
+
+#: src/cddb.c:589 src/cddb.c:1498
+msgid "Select all lines"
+msgstr "Izaberi sve redove"
+
+#: src/cddb.c:702
+msgid ""
+"Select lines to 'apply' to your files list. All lines will be processed if "
+"no line is selected.\n"
+"You can also reorder lines in this list before using 'apply' button."
+msgstr ""
+"Izaberi redove za upis u listu datoteka. Svi redovi će biti upisane ukoliko "
+"nijedan nije izabran.\n"
+"Takođe možete preurediti redove u ovoj listi pre korišćenja „Primeni“ "
+"dugmeta."
+
+#.
+#. * Apply results to fields...
+#.
+#: src/cddb.c:712
+msgid "Set Into :"
+msgstr "Unesi u :"
+
+#: src/cddb.c:719
+msgid "All"
+msgstr "Sve"
+
+#: src/cddb.c:721 src/misc.c:1958
+msgid "File Name"
+msgstr "Ime datoteke"
+
+#: src/cddb.c:722 src/misc.c:1959
+msgid "Title"
+msgstr "Naslov"
+
+#: src/cddb.c:725 src/misc.c:1963
+msgid "Year"
+msgstr "Godina"
+
+#: src/cddb.c:726
+msgid "Track #"
+msgstr "Numera #"
+
+#: src/cddb.c:727
+msgid "# Tracks"
+msgstr "# Numere"
+
+#: src/cddb.c:728 src/misc.c:1965
+msgid "Genre"
+msgstr "Žanr"
+
+#. Check box to run the scanner
+#: src/cddb.c:765 src/misc.c:3013
+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:772
+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:777 src/prefs.c:1362
+msgid ""
+"When activating this option, the Levenshtein algorithm (DLM : Damerau-"
+"Levenshtein Metric) will be used to match the CDDB title against every file "
+"name in the current folder, and to select the best match. This will be used "
+"when selecting the corresponding audio file, or applying cddb results, "
+"instead of using directly the position order."
+msgstr ""
+"Kada aktivirate ovu opciju, Levenštajnov algoritam (DLM : Damerau-"
+"Levenshtein Metric) će biti korišćen za poklapanje imena numere iz CD baze "
+"sa svakim imenom datoteke u tekućem direktorijumu, birajući najbolja "
+"poklapanja. Ovo će biti korišćeno kada izaberete odgovarajuću audio datoteku "
+"ili primenite rezultate iz CD baze podataka, umesto da direktno koristi "
+"redosled."
+
+#: src/cddb.c:789
+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:798 src/misc.c:2255
+msgid "Ready to search..."
+msgstr "Spremno za pretragu..."
+
+#: src/cddb.c:1318
+#, c-format
+msgid ""
+"Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
+msgstr ""
+"Album: '%s', izvođač: '%s', dužina numere: '%s', godina: '%s', žanr: '%s', "
+"ID: '%s'"
+
+#: src/cddb.c:1508
+msgid "Invert selection"
+msgstr "Izaberi obratno"
+
+#: src/cddb.c:1516
+msgid "Sort by Track Number"
+msgstr "Sortiraj po broju numere"
+
+#: src/cddb.c:1521
+msgid "Sort by Track Name"
+msgstr "Sortiraj po imenu numere"
+
+#: src/cddb.c:1619
+#, c-format
+msgid "Resolving host '%s' ..."
+msgstr "Pristupam serveru „%s“ ..."
+
+#: src/cddb.c:1627
+#, c-format
+msgid "Can't resolve host '%s' (%s)!"
+msgstr "Ne mogu da pristupim serveru „%s“ (%s)!"
+
+#: src/cddb.c:1642
+#, 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:1656
+#, c-format
+msgid "Connecting to host '%s', port '%d' ..."
+msgstr "Povezivanje na server „%s“, port „%d“ ..."
+
+#: src/cddb.c:1663
+#, c-format
+msgid "Can't connect to host '%s' (%s)!"
+msgstr "Ne mogu da se povežem sa serverom „%s“ (%s)!"
+
+#: src/cddb.c:1669
+#, c-format
+msgid "Connected to host '%s'"
+msgstr "Uspostavljena veza sa serverom „%s“"
+
+#: src/cddb.c:1752
+#, c-format
+msgid "Receiving data (%s) ..."
+msgstr "Prenosim podatke (%s) ..."
+
+#: src/cddb.c:1764
+#, c-format
+msgid "Error when reading cddb response (%s)!"
+msgstr "Greška pri čitanju odgovora iz CD baze (%s)!"
+
+#: src/cddb.c:1770
+#, c-format
+msgid "Can't create file '%s' (%s)"
+msgstr "Ne mogu da napravim datoteku „%s“ (%s)"
+
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#, c-format
+msgid "Can't open file '%s' (%s)"
+msgstr "Ne mogu da otvorim datoteku „%s“ (%s)"
+
+#. g_print("Request : '%s'\n", cddb_in);
+#. Send the request
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
+msgid "Sending request ..."
+msgstr "Šaljem zahtev ..."
+
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#, c-format
+msgid "Can't send the request (%s)!"
+msgstr "Ne mogu da pošaljem zahtev (%s)!"
+
+#.
+#. * Read the answer
+#.
+#. Read the answer
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+msgid "Receiving data ..."
+msgstr "Primam podatke ..."
+
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+msgid "The server returned a wrong answer!"
+msgstr "Server je vratio pogrešan odgovor!"
+
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#, c-format
+msgid "The server returned a wrong answer! (%s)"
+msgstr "Server je vratio pogrešan odgovor! (%s)"
+
+#: src/cddb.c:2440
+msgid "Sorry, the web-based search is currently down!"
+msgstr "Nažalost, veb bazirana pretraga je trenutno onesposobljena!"
+
+#: src/cddb.c:2442 src/cddb.c:2785
+#, c-format
+msgid "Found %d matching album(s)"
+msgstr "Nađen(o) %d album(a) sa poklapanjem"
+
+#: src/cddb.c:2585
+#, c-format
+msgid "Receiving data of page %d (album %d/%d)..."
+msgstr "Primam podatke stranice %d (album %d/%d)..."
+
+#: src/cddb.c:2587
+#, c-format
+msgid "Receiving data of page %d ..."
+msgstr "Primam podatke stranice %d ..."
+
+#: src/cddb.c:2752
+msgid "More results to load ..."
+msgstr "Još rezultata da učitam..."
+
+#: src/cddb.c:2881
+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:2889
+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:2895
+#, fuzzy, c-format
+msgid "%d file(s) selected!"
+msgstr "%d datoteka izabrana"
+
+#: src/cddb.c:2970
+msgid "Local CD search..."
+msgstr "Lokalna pretraga CD-a..."
+
+#: src/cddb.c:2971
+msgid ""
+"The path for 'Local CD Data Base' wasn't defined!\n"
+"Fill it in the preferences window."
+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:3115
+#, 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:3268
+#, 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:3364
+#, 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:3622
+msgid "Loading album track list ..."
+msgstr "Čitam listu numera albuma..."
+
+#: src/cddb.c:3797
+#, c-format
+msgid ""
+"Be careful, you are applying %d lines of the CDDB results to %d lines in the "
+"list of files!\n"
+"\n"
+"Do you want to continue ?"
+msgstr ""
+"Budite oprezni, primenjujete %d red(a) iz rezultata CD baze na %d red(a) u "
+"listi datoteka!\n"
+"\n"
+"Da li želite da nastavite?"
+
+#: src/cddb.c:3800
+msgid "Write Tag from CDDB..."
+msgstr "Upiši oznake iz CD baze..."
+
+#: src/charset.c:49
+msgid "Arabic (IBM-864)"
+msgstr "Arapski (IBM-864)"
+
+#: src/charset.c:50
+msgid "Arabic (ISO-8859-6)"
+msgstr "Arapski (ISO-8859-6)"
+
+#: src/charset.c:51
+msgid "Arabic (Windows-1256)"
+msgstr "Arapski (Windows-1256)"
+
+#: src/charset.c:52
+msgid "Baltic (ISO-8859-13)"
+msgstr "Baltički (ISO-8859-13)"
+
+#: src/charset.c:53
+msgid "Baltic (ISO-8859-4)"
+msgstr "Baltički (ISO-8859-4)"
+
+#: src/charset.c:54
+msgid "Baltic (Windows-1257)"
+msgstr "Baltički (Windows-1257)"
+
+#: src/charset.c:55
+msgid "Celtic (ISO-8859-14)"
+msgstr "Keltski (ISO-8859-14)"
+
+#: src/charset.c:56
+msgid "Central European (IBM-852)"
+msgstr "Centralno evropski (IBM-852)"
+
+#: src/charset.c:57
+msgid "Central European (ISO-8859-2)"
+msgstr "Centralno evropski (ISO-8859-2)"
+
+#: src/charset.c:58
+msgid "Central European (Windows-1250)"
+msgstr "Centralno evropski (Windows-1250)"
+
+#: src/charset.c:59
+msgid "Chinese Simplified (GB18030)"
+msgstr "Uprošćeni kineski (GB18030)"
+
+#: src/charset.c:60
+msgid "Chinese Simplified (GB2312)"
+msgstr "Uprošćeni kineski (GB2312)"
+
+#: src/charset.c:61
+msgid "Chinese Traditional (Big5)"
+msgstr "Tradicionalni kineski (Big5)"
+
+#: src/charset.c:62
+msgid "Chinese Traditional (Big5-HKSCS)"
+msgstr "Tradicionalni kineski (Big5-HKSCS)"
+
+#: src/charset.c:63
+msgid "Cyrillic (IBM-855)"
+msgstr "Ćirilični (IBM-855)"
+
+#: src/charset.c:64
+msgid "Cyrillic (ISO-8859-5)"
+msgstr "Ćirilični (ISO-8859-5)"
+
+#: src/charset.c:65
+msgid "Cyrillic (ISO-IR-111)"
+msgstr "Ćirilični (ISO-IR-111)"
+
+#: src/charset.c:66
+msgid "Cyrillic (KOI8-R)"
+msgstr "Ćirilični (KOI8-R)"
+
+#: src/charset.c:67
+msgid "Cyrillic (Windows-1251)"
+msgstr "Ćirilični (Windows-1251)"
+
+#: src/charset.c:68
+msgid "Cyrillic/Russian (CP-866)"
+msgstr "Ćirilični/Ruski (CP-866)"
+
+#: src/charset.c:69
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr "Ćirilični/Ukrainski (KOI8-U)"
+
+#: src/charset.c:70
+msgid "English (US-ASCII)"
+msgstr "Engleski (US-ASCII)"
+
+#: src/charset.c:71
+msgid "Greek (ISO-8859-7)"
+msgstr "Grčki (ISO-8859-7)"
+
+#: src/charset.c:72
+msgid "Greek (Windows-1253)"
+msgstr "Grčki (Windows-1253)"
+
+#: src/charset.c:73
+msgid "Hebrew (IBM-862)"
+msgstr "Hebrejski (IBM-862)"
+
+#: src/charset.c:74
+msgid "Hebrew (Windows-1255)"
+msgstr "Hebrejski (Windows-1255)"
+
+#: src/charset.c:75
+msgid "Japanese (EUC-JP)"
+msgstr "Japanski (EUC-JP)"
+
+#: src/charset.c:76
+msgid "Japanese (ISO-2022-JP)"
+msgstr "Japanski (ISO-2022-JP)"
+
+#: src/charset.c:77
+msgid "Japanese (Shift_JIS)"
+msgstr "Japanski (Shift_JIS)"
+
+#: src/charset.c:78
+msgid "Korean (EUC-KR)"
+msgstr "Korejski (EUC-KR)"
+
+#: src/charset.c:79
+msgid "Nordic (ISO-8859-10)"
+msgstr "Nordijski (ISO-8859-10)"
+
+#: src/charset.c:80
+msgid "South European (ISO-8859-3)"
+msgstr "Južno evropski (ISO-8859-3)"
+
+#: src/charset.c:81
+msgid "Thai (TIS-620)"
+msgstr "Tai (TIS-620)"
+
+#: src/charset.c:82
+msgid "Turkish (IBM-857)"
+msgstr "Turski (IBM-857)"
+
+#: src/charset.c:83
+msgid "Turkish (ISO-8859-9)"
+msgstr "Turski (ISO-8859-9)"
+
+#: src/charset.c:84
+msgid "Turkish (Windows-1254)"
+msgstr "Turski (Windows-1254)"
+
+#. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
+#: src/charset.c:86
+msgid "Unicode (UTF-8)"
+msgstr "Unikod (UTF-8)"
+
+#. {N_("Unicode (UTF-16BE)"),                "UTF-16BE"      },
+#. {N_("Unicode (UTF-16LE)"),                "UTF-16LE"      },
+#. {N_("Unicode (UTF-32BE)"),                "UTF-32BE"      },
+#. {N_("Unicode (UTF-32LE)"),                "UTF-32LE"      },
+#: src/charset.c:93
+msgid "Vietnamese (VISCII)"
+msgstr "Vijetnamski (VISCII)"
+
+#: src/charset.c:94
+msgid "Vietnamese (Windows-1258)"
+msgstr "Vijetnamski (Windows-1258)"
+
+#: src/charset.c:95
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr "Vizuelni hebrejski (ISO-8859-8)"
+
+#: src/charset.c:96
+msgid "Western (IBM-850)"
+msgstr "Zapadnjački (IBM-850)"
+
+#: src/charset.c:97
+msgid "Western (ISO-8859-1)"
+msgstr "Zapadnjački (ISO-8859-1)"
+
+#: src/charset.c:98
+msgid "Western (ISO-8859-15)"
+msgstr "Zapadnjački (ISO-8859-15)"
+
+#: src/charset.c:99
+msgid "Western (Windows-1252)"
+msgstr "Zapadnjački (Windows-1252)"
+
+#: src/charset.c:542
+#, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+msgstr "Ime datoteke „%s“ ne može biti prevedeno u UTF-8 (%s).\n"
+
+#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+msgid "Invalid UTF-8"
+msgstr "Neispravan UTF-8"
+
+#: src/charset.c:641
+#, c-format
+msgid ""
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+msgstr ""
+"UTF-8 karakter „%s“ ne može biti preveden u kodiranje (%s) za ime datoteke\n"
+
+#: src/charset.c:705
+#, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+msgstr "Karakter „%s“ ne može biti preveden u UTF-8 (%s).\n"
+
+#. Starting messages
+#: src/easytag.c:177
+#, c-format
+msgid "Starting EasyTAG %s (PId: %d) ..."
+msgstr "Pokrećem EasyTAG %s (PId: %d) ..."
+
+#: src/easytag.c:179
+#, c-format
+msgid "Currently using libid3tag version %s ..."
+msgstr "Koristim libid3tag verzije %s ..."
+
+#: src/easytag.c:182
+#, c-format
+msgid "Currently using id3lib version %d.%d.%d ..."
+msgstr "Koristim id3lib verzije %d.%d.%d ..."
+
+#: src/easytag.c:189
+#, c-format
+msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
+msgstr "Promenjljiva EASYTAGLANG definisana. Postavljam lokalizaciju: „%s“"
+
+#: src/easytag.c:191
+#, c-format
+msgid "Setting locale : '%s'"
+msgstr "Postavljam lokalizaciju: „%s“"
+
+#: src/easytag.c:195
+#, c-format
+msgid "Currently using locale '%s' (and eventually '%s')..."
+msgstr "Trenutno koristim lokalizaciju „%s„ (i eventualno „%s“)..."
+
+#: src/easytag.c:211
+#, c-format
+msgid "%s %s by %s (compiled %s, %s)\n"
+msgstr "%s %s od %s (preveden %s, %s)\n"
+
+#: src/easytag.c:213
+#, c-format
+msgid "Web Page: %s"
+msgstr "Internet prezentacija: %s"
+
+#: src/easytag.c:288
+#, c-format
+msgid "Unknown parameter or path '%s'\n"
+msgstr "Nepoznati parametar u stazi „%s“\n"
+
+#.
+#. * Browser
+#.
+#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+msgid "Browser"
+msgstr "Pregledač"
+
+#: src/easytag.c:424 src/et_core.c:2605
+msgid "File"
+msgstr "Datoteka"
+
+#: src/easytag.c:450
+msgid "Read Only File"
+msgstr "Neizmenjljiva datoteka"
+
+#: src/easytag.c:453
+msgid "File Link Broken"
+msgstr "Veza sa datotekom prekinuta"
+
+#. Default values are MPs data
+#. MPEG, Layer versions
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+msgid "MPEG"
+msgstr "MPEG"
+
+#: src/easytag.c:469 src/easytag.c:4067
+msgid "?, Layer ?"
+msgstr "?. Sloj ?"
+
+#: src/easytag.c:474
+msgid "Bitrate:"
+msgstr "Bitski protok:"
+
+#: src/easytag.c:476 src/easytag.c:4068
+msgid "? kb/s"
+msgstr "? kb/s"
+
+#: src/easytag.c:481
+msgid "Freq:"
+msgstr "Učestanost:"
+
+#: src/easytag.c:483 src/easytag.c:4069
+msgid "? Hz"
+msgstr "? Hz"
+
+#. Mode
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+msgid "Mode:"
+msgstr "Mod:"
+
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
+msgid "?"
+msgstr "?"
+
+#: src/easytag.c:498
+msgid "Size:"
+msgstr "Veličina:"
+
+#: src/easytag.c:500
+msgid "? kb"
+msgstr "? kb"
+
+#: src/easytag.c:505
+msgid "Time:"
+msgstr "Vreme:"
+
+#. Main Frame
+#: src/easytag.c:551 src/et_core.c:2543
+msgid "Tag"
+msgstr "Oznaka"
+
+#.
+#. * 1 - Page for common tag fields
+#.
+#: src/easytag.c:573
+msgid "Common"
+msgstr "Česta polja"
+
+#. Title
+#: src/easytag.c:585
+msgid "Title:"
+msgstr "Naslov:"
+
+#: src/easytag.c:598
+msgid "Tag selected files with this title"
+msgstr "Dodaj oznaku naslov obeleženim datotekama"
+
+#. Artist
+#: src/easytag.c:605
+msgid "Artist:"
+msgstr "Izvođač:"
+
+#: src/easytag.c:617
+msgid "Tag selected files with this artist"
+msgstr "Dodaj oznaku izvođač obeleženim datotekama"
+
+#. Album
+#: src/easytag.c:623
+msgid "Album:"
+msgstr "Album:"
+
+#: src/easytag.c:636
+msgid "Tag selected files with this album name"
+msgstr "Dodaj oznaku album obeleženim datotekama"
+
+#. Disc Number
+#: src/easytag.c:642
+msgid "CD:"
+msgstr "CD:"
+
+#: src/easytag.c:658
+msgid "Tag selected files with this disc number"
+msgstr "Dodaj oznaku broj CD-a obeleženim datotekama"
+
+#. Year
+#: src/easytag.c:664
+msgid "Year:"
+msgstr "Godina:"
+
+#: src/easytag.c:681
+msgid "Tag selected files with this year"
+msgstr "Dodaj oznaku godina obeleženim datotekama"
+
+#: src/easytag.c:693
+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:702
+msgid "Track #:"
+msgstr "Numera #:"
+
+#: src/easytag.c:728
+msgid ""
+"Set the number of files, in the same directory of the displayed file, to the "
+"selected tracks."
+msgstr ""
+"Unesi broj datoteka, u istom direktorijumu kao i prikazana datoteka, da bi "
+"izabrao numere."
+
+#: src/easytag.c:747
+msgid "Tag selected files with this number of tracks"
+msgstr "Dodaj oznaku broj numera obeleženim datotekama"
+
+#. Genre
+#: src/easytag.c:753
+msgid "Genre:"
+msgstr "Žanr:"
+
+#: src/easytag.c:778
+msgid "Tag selected files with this genre"
+msgstr "Dodaj oznaku žanr obeleženim datotekama"
+
+#. Comment
+#: src/easytag.c:784
+msgid "Comment:"
+msgstr "Komentar:"
+
+#: src/easytag.c:809
+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:818
+msgid "Composer:"
+msgstr "Kompozitor:"
+
+#: src/easytag.c:830
+msgid "Tag selected files with this composer"
+msgstr "Dodaj oznaku kompozitor obeleženim datotekama"
+
+#. Original Artist / Performer
+#: src/easytag.c:837
+msgid "Orig. Artist:"
+msgstr "Orig. izvođač:"
+
+#: src/easytag.c:849
+msgid "Tag selected files with this original artist"
+msgstr "Dodaj oznaku originalni izvođač obeleženim datotekama"
+
+#. Copyright
+#: src/easytag.c:856
+msgid "Copyright:"
+msgstr "Autorsko pravo:"
+
+#: src/easytag.c:868
+msgid "Tag selected files with this copyright"
+msgstr "Dodaj oznaku autorsko pravo obeleženim datotekama"
+
+#. URL
+#: src/easytag.c:875
+msgid "URL:"
+msgstr "URL:"
+
+#: src/easytag.c:887
+msgid "Tag selected files with this URL"
+msgstr "Dodaj oznaku URL obeleženim datotekama"
+
+#. Encoded by
+#: src/easytag.c:894
+msgid "Encoded by:"
+msgstr "Kodirano pomoću:"
+
+#: src/easytag.c:906
+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:966
+msgid "Pictures"
+msgstr "Slike"
+
+#. Picture
+#: src/easytag.c:977
+msgid "Pictures:"
+msgstr "Slike:"
+
+#: src/easytag.c:997
+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:1035
+msgid "Tag selected files with these pictures"
+msgstr "Dodaj slike obeleženim datotekama"
+
+#: src/easytag.c:1045
+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:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "Ukloni izabrane slike, u suprotnom sve slike."
+
+#: src/easytag.c:1061
+msgid "Save the selected pictures on the hard disk."
+msgstr "Sačuvaj izabrane slike na tvrdi disk."
+
+#: src/easytag.c:1068
+msgid "Set properties of the selected pictures."
+msgstr "Postavi atribute izabranih slika."
+
+#: src/easytag.c:1148
+#, c-format
+msgid "Selected files tagged with title '%s'."
+msgstr "Izabrane datoteke označene naslovom „%s“."
+
+#: src/easytag.c:1150
+msgid "Removed title from selected files."
+msgstr "Uklonjen naslov iz izabranih datoteka."
+
+#: src/easytag.c:1167
+#, c-format
+msgid "Selected files tagged with artist '%s'."
+msgstr "Izabrane datoteke označene izvođačem „%s“."
+
+#: src/easytag.c:1169
+msgid "Removed artist from selected files."
+msgstr "Uklonjen izvođača iz izabranih datoteka."
+
+#: src/easytag.c:1186
+#, c-format
+msgid "Selected files tagged with album '%s'."
+msgstr "Izabrane datoteke označene albumom „%s“."
+
+#: src/easytag.c:1188
+msgid "Removed album name from selected files."
+msgstr "Uklonjeno ime albuma iz izabranih datoteka."
+
+#: src/easytag.c:1205
+#, c-format
+msgid "Selected files tagged with disc number '%s'."
+msgstr "Izabrane datoteke označene brojem diska „%s“."
+
+#: src/easytag.c:1207
+msgid "Removed disc number from selected files."
+msgstr "Uklonjen broj diska iz izabranih datoteka."
+
+#: src/easytag.c:1224
+#, c-format
+msgid "Selected files tagged with year '%s'."
+msgstr "Izabrane datoteke označene godinom „%s“."
+
+#: src/easytag.c:1226
+msgid "Removed year from selected files."
+msgstr "Uklonjena godina iz izabranih datoteka."
+
+#: src/easytag.c:1254 src/easytag.c:1350
+#, c-format
+msgid "Selected files tagged with track like 'xx/%s'."
+msgstr "Izabrane datoteke označene nazivom tipa „xx/%s“."
+
+#: src/easytag.c:1257
+msgid "Selected files tagged with track like 'xx'."
+msgstr "Izabrane datoteke označene nazivom tipa „xx“."
+
+#: src/easytag.c:1261 src/easytag.c:1353
+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:1319
+msgid "Selected tracks numbered sequentially."
+msgstr "Izabrane datoteke pobrojane redom."
+
+#: src/easytag.c:1371
+#, c-format
+msgid "Selected files tagged with genre '%s'."
+msgstr "Izabrane datoteke označene žanrom „%s“."
+
+#: src/easytag.c:1373
+msgid "Removed genre from selected files."
+msgstr "Uklonjen žanr iz izabranih datoteka."
+
+#: src/easytag.c:1397
+#, c-format
+msgid "Selected files tagged with comment '%s'."
+msgstr "Izabrane datoteke označene komentarom „%s“."
+
+#: src/easytag.c:1399
+msgid "Removed comment from selected files."
+msgstr "Uklonjen komentar iz izabranih datoteka."
+
+#: src/easytag.c:1416
+#, c-format
+msgid "Selected files tagged with composer '%s'."
+msgstr "Izabrane datoteke označene kompozitorom „%s“."
+
+#: src/easytag.c:1418
+msgid "Removed composer from selected files."
+msgstr "Uklonjen kompozitor iz izabranih datoteka."
+
+#: src/easytag.c:1435
+#, c-format
+msgid "Selected files tagged with original artist '%s'."
+msgstr "Izabrane datoteke označene sa originalnim izvođačem „%s“."
+
+#: src/easytag.c:1437
+msgid "Removed original artist from selected files."
+msgstr "Uklonjen originalni izvođač iz izabranih datoteka."
+
+#: src/easytag.c:1454
+#, c-format
+msgid "Selected files tagged with copyright '%s'."
+msgstr "Izabrane datoteke označene autorskim pravom „%s“."
+
+#: src/easytag.c:1456
+msgid "Removed copyright from selected files."
+msgstr "Uklonjeno autorsko pravo iz izabranih datoteka."
+
+#: src/easytag.c:1473
+#, c-format
+msgid "Selected files tagged with URL '%s'."
+msgstr "Izabrane datoteke označene URL-om „%s“."
+
+#: src/easytag.c:1475
+msgid "Removed URL from selected files."
+msgstr "Uklonjen URL iz izabranih datoteka."
+
+#: src/easytag.c:1492
+#, c-format
+msgid "Selected files tagged with encoder name '%s'."
+msgstr "Izabrane datoteke označene sa imenom kodera „%s“."
+
+#: src/easytag.c:1494
+msgid "Removed encoder name from selected files."
+msgstr "Uklonjeno ime kodera iz izabranih datoteka."
+
+#: src/easytag.c:1529
+msgid "Selected files tagged with pictures."
+msgstr "Izabrane datoteke označene slikama."
+
+#: src/easytag.c:1531
+msgid "Removed pictures from selected files."
+msgstr "Uklonjene slike iz izabranih datoteka."
+
+#: src/easytag.c:1770
+msgid "Select Mode and Mask, and redo the same action"
+msgstr "Izabrani mod i maska, i ponovi su iste komande."
+
+#: src/easytag.c:1825
+msgid "All tags have been scanned"
+msgstr "Sve oznake su skenirane"
+
+#: src/easytag.c:1882
+msgid "All tags have been removed"
+msgstr "Sve oznake su uklonjene"
+
+#: src/easytag.c:2177 src/easytag.c:2200
+msgid "All files have been saved..."
+msgstr "Sve datoteke su sačuvane..."
+
+#: src/easytag.c:2198
+msgid "Files have been partially saved..."
+msgstr "Datoteke su polovično sačuvane..."
+
+#: src/easytag.c:2348
+msgid "Files have been partially deleted..."
+msgstr "Datoteke su polovično uklonjene..."
+
+#: src/easytag.c:2350
+msgid "All files have been deleted..."
+msgstr "Sve datoteke su uklonjene..."
+
+#: src/easytag.c:2422
+#, c-format
+msgid ""
+"Do you want to write the tag of file\n"
+"'%s' ?"
+msgstr ""
+"Da li želite da upišete oznaku datoteke\n"
+"„%s“ ?"
+
+#: src/easytag.c:2426 src/easytag.c:2431
+msgid "Write Tag..."
+msgstr "Upiši oznaku..."
+
+#. Directories and filename changed
+#: src/easytag.c:2488
+msgid "Rename File and Directory..."
+msgstr "Preimenuj datoteku i direktorijum..."
+
+#: src/easytag.c:2489
+#, c-format
+msgid ""
+"Do you want to rename the file and directory \n"
+"'%s'\n"
+"to \n"
+"'%s' ?"
+msgstr ""
+"Želite li da preimenujete datoteku i direktorijum\n"
+"„%s“\n"
+"u \n"
+"„%s“ ?"
+
+#. Only directories changed
+#: src/easytag.c:2494
+msgid "Rename Directory..."
+msgstr "Preimenuj direktorijum..."
+
+#: src/easytag.c:2495
+#, c-format
+msgid ""
+"Do you want to rename the directory \n"
+"'%s'\n"
+"to \n"
+"'%s' ?"
+msgstr ""
+"Želite li da preimenujete direktorijum \n"
+"„%s“\n"
+"u \n"
+"„%s“ ?"
+
+#. Only filename changed
+#: src/easytag.c:2501
+msgid "Rename File..."
+msgstr "Preimenuj datoteku..."
+
+#: src/easytag.c:2502
+#, c-format
+msgid ""
+"Do you want to rename the file \n"
+"'%s'\n"
+"to \n"
+"'%s' ?"
+msgstr ""
+"Želite li da preimenujete datoteku \n"
+"„%s“\n"
+"u \n"
+"„%s“ ?"
+
+#: src/easytag.c:2571
+#, c-format
+msgid "Writing tag of '%s'"
+msgstr "Upisivanje oznake od „%s“"
+
+#: src/easytag.c:2577
+msgid "Tag(s) written"
+msgstr "Oznaka(e) upisane"
+
+#. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
+#: src/easytag.c:2586 src/easytag.c:2591
+#, c-format
+msgid ""
+"Can't write tag in file '%s'!\n"
+"(%s)"
+msgstr ""
+"Ne mogu da upišem oznaku u datoteku „%s“!\n"
+"(%s)"
+
+#: src/easytag.c:2717
+#, 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:2737 src/easytag.c:2769 src/easytag.c:2941
+#, c-format
+msgid ""
+"Can't rename file '%s'\n"
+" to \n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"Ne mogu da preimenujem datoteku „%s“\n"
+" u \n"
+"„%s“!\n"
+"(%s)"
+
+#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+msgid "File(s) not renamed..."
+msgstr "Datoteka(e) nisu preimenovane..."
+
+#: src/easytag.c:2784
+#, c-format
+msgid ""
+"Can't rename file \n"
+"'%s'\n"
+"because the following file already exists:\n"
+"'%s'"
+msgstr ""
+"Ne mogu da preimenujem datoteku \n"
+"„%s“\n"
+"jer sledeća već postoji:\n"
+"„%s“"
+
+#: src/easytag.c:2816
+#, c-format
+msgid ""
+"Can't create target directory\n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"Ne mogu da napravim direktorijum\n"
+"„%s“!\n"
+"(%s)"
+
+#. Renaming file has succeeded
+#: src/easytag.c:2838
+#, c-format
+msgid "Renamed file '%s' to '%s'"
+msgstr "Preimenovana datoteka „%s“ u „%s“"
+
+#: src/easytag.c:2844
+msgid "File(s) renamed..."
+msgstr "Datoteka(e) preimenovane..."
+
+#: src/easytag.c:2854 src/easytag.c:2901
+#, c-format
+msgid ""
+"Can't remove old directory\n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"Ne mogu da uklonim stari direktorijum\n"
+"„%s“!\n"
+"(%s)"
+
+#. Renaming file has succeeded
+#: src/easytag.c:2885
+#, c-format
+msgid "Moved file '%s' to '%s'"
+msgstr "Premeštena datoteka „%s“ to „%s“"
+
+#: src/easytag.c:2891
+msgid "File(s) moved..."
+msgstr "Datoteka(e) premeštene..."
+
+#. Moving file has failed
+#: src/easytag.c:2923
+#, c-format
+msgid ""
+"Can't move file '%s'\n"
+" to \n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"Ne mogu da premestim datoteku „%s“\n"
+" to \n"
+"„%s“!\n"
+"(%s)"
+
+#: src/easytag.c:2931
+msgid "File(s) not moved..."
+msgstr "Datoteka(e) niso premeštene..."
+
+#: src/easytag.c:2983
+#, c-format
+msgid ""
+"Do you really want to delete definitively the file\n"
+"'%s' ?"
+msgstr ""
+"Da li zaista želite da uklonite datoteku\n"
+"„%s“ ?"
+
+#: src/easytag.c:2986 src/easytag.c:2990
+msgid "Delete File..."
+msgstr "Ukloni datoteku..."
+
+#: src/easytag.c:3012
+#, c-format
+msgid "File '%s' deleted"
+msgstr "Datoteka „%s“ uklođena"
+
+#: src/easytag.c:3147
+#, c-format
+msgid ""
+"Can't read directory :\n"
+"'%s'\n"
+"(%s)"
+msgstr ""
+"Ne mogu da čitam direktorijum:\n"
+"„%s“\n"
+"(%s)"
+
+#. Read the directory recursively
+#: src/easytag.c:3170
+msgid "Search in progress..."
+msgstr "Pretraga u toku..."
+
+#: src/easytag.c:3187 src/et_core.c:2612
+#, c-format
+msgid "File: '%s'"
+msgstr "Datoteka: „%s“"
+
+#: src/easytag.c:3237
+#, 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:3239
+#, 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:3252 src/et_core.c:2696
+#, c-format
+msgid "%u file(s)"
+msgstr "%u datoteka(e)"
+
+#: src/easytag.c:3258
+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:3260
+msgid "No file found in this directory!"
+msgstr "Ni jedna datoteka nije pronađena u ovom direktorijumu!"
+
+#: src/easytag.c:3348
+msgid "Searching..."
+msgstr "Tražim..."
+
+#. Button to stop...
+#: src/easytag.c:3368
+msgid "  STOP the search...  "
+msgstr "Prekini pretragu..."
+
+#. Open the last selected scanner
+#: src/easytag.c:4093
+msgid "Select a directory to browse!"
+msgstr "Izaberi direktorijum za pregled!"
+
+#. Menu items
+#: src/easytag.c:4229
+msgid "Tag selected files with this field"
+msgstr "Označi izabrane datoteke ovim poljem"
+
+#: src/easytag.c:4240
+msgid "Convert '_' and '%20' to spaces"
+msgstr "Prevedi „_“ i „%20“ u razmak"
+
+#: src/easytag.c:4247 src/scan.c:2245
+msgid "Convert ' ' to '_'"
+msgstr "Prevedi „ “ u „_“"
+
+#. Group: capitalize, ...
+#: src/easytag.c:4258 src/scan.c:2294
+msgid "All uppercase"
+msgstr "Sva slova velika"
+
+#: src/easytag.c:4265 src/scan.c:2295
+msgid "All downcase"
+msgstr "Sva slova mala"
+
+#: src/easytag.c:4272 src/scan.c:2296
+msgid "First letter uppercase"
+msgstr "Prvo slovo veliko"
+
+#: src/easytag.c:4279 src/scan.c:2297
+msgid "First letter uppercase of each word"
+msgstr "Prvo slovo svake reči veliko"
+
+#. Group: insert/remove spaces
+#: src/easytag.c:4290 src/scan.c:2336
+msgid "Remove spaces"
+msgstr "Ukloni razmake"
+
+#: src/easytag.c:4297
+msgid "Insert space before uppercase letter"
+msgstr "Ubaci razmak pre veliko slova"
+
+#: src/easytag.c:4304
+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:4324 src/easytag.c:4332
+#, c-format
+msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
+msgstr "EasyTAG %s: Nenormalno izašao! (PID: %d)."
+
+#: src/easytag.c:4325 src/easytag.c:4334
+#, c-format
+msgid "Received signal %s (%d)\a"
+msgstr "Dobijen signal %s (%d)\a"
+
+#: src/easytag.c:4327 src/easytag.c:4336
+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@gmail.com"
+msgstr ""
+"Verovatno ste našli grešku u programu EasyTAG. Molimo vas, pošaljite nam "
+"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@gmail.com"
+
+#: src/easytag.c:4463
+msgid "Unknown signal"
+msgstr "Nepoznat signal"
+
+#: src/easytag.c:4479
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage: easytag [option] \n"
+"   or: easytag [directory]\n"
+"\n"
+"Option:\n"
+"-------\n"
+"-h, --help        Display this text and exit.\n"
+"-v, --version     Print basic informations and exit.\n"
+"\n"
+"Directory:\n"
+"----------\n"
+"%s/path_to/files  Use an absolute path to load,\n"
+"path_to/files     Use a relative path.\n"
+"\n"
+msgstr ""
+"\n"
+"Korišćenje: easytag [opcije] \n"
+"   ili: easytag [direktorijum]\n"
+"\n"
+"Opcije:\n"
+"-------\n"
+"-h, --help        Prikaži ovu poruku i izađi.\n"
+"-v, --version     Prikaži osnovne informacije i izađi.\n"
+"\n"
+"Direktorijum:\n"
+"----------\n"
+"c:/putanja_do/datoteka  Koristi apsolutnu putanju za učitavanje,\n"
+"/putanja_do/datoteka    Koristi apsolutnu putanju za učitavanje,\n"
+"putanja_do/datoteka     Koristi relativnu putanju.\n"
+"\n"
+
+#: src/easytag.c:4507
+msgid "EasyTAG: Normal exit."
+msgstr "EasyTAG: Normalan izlaz."
+
+#: src/easytag.c:4550 src/easytag.c:4589
+msgid ""
+"Some files have been modified but not saved...\n"
+"Do you want to save them before exiting the program?"
+msgstr ""
+"Neke datoteke su izmenjene ali nisu sačuvane...\n"
+"Želite li da ih sačuvate pre izlaska iz programa?"
+
+#: src/easytag.c:4570
+msgid " Do you really want to exit the program? "
+msgstr "Da li zaista želite da izađete iz programa?"
+
+#: src/et_core.c:2509
+msgid "ID3 Tag"
+msgstr "ID3 oznaka"
+
+#: src/et_core.c:2515
+msgid "Ogg Vorbis Tag"
+msgstr "Ogg Vorbis oznaka"
+
+#: src/et_core.c:2521
+msgid "FLAC Vorbis Tag"
+msgstr "FLAC Vorbis oznaka"
+
+#: src/et_core.c:2526
+msgid "APE Tag"
+msgstr "APE oznaka"
+
+#: src/et_core.c:2531
+msgid "MP4/M4A/AAC Tag"
+msgstr "MP4/M4A/AAC oznaka"
+
+#: src/et_core.c:2537
+msgid "Wavpack Tag"
+msgstr "Wavpack oznaka"
+
+#: src/et_core.c:2557
+msgid "MP3 File"
+msgstr "MP3 datoteka"
+
+#: src/et_core.c:2561
+msgid "MP2 File"
+msgstr "MP2 daoteka"
+
+#: src/et_core.c:2567
+msgid "Ogg Vorbis File"
+msgstr "Ogg Vorbis datoteka"
+
+#: src/et_core.c:2573
+msgid "Speex File"
+msgstr "Speex datoteka"
+
+#: src/et_core.c:2579
+msgid "FLAC File"
+msgstr "FLAC datoteka"
+
+#: src/et_core.c:2584
+msgid "MusePack File"
+msgstr "MusePack datoteka"
+
+#: src/et_core.c:2588
+msgid "Monkey's Audio File"
+msgstr "Monkey audio datoteka"
+
+#: src/et_core.c:2593
+msgid "MP4/AAC File"
+msgstr "MP4/AAC datoteka"
+
+#: src/et_core.c:2599
+msgid "Wavpack File"
+msgstr "Wavpack dateoteka"
+
+#: src/et_core.c:2873
+#, c-format
+msgid "Pictures (%d)"
+msgstr "Slike (%d)"
+
+#. Bitrate
+#: src/et_core.c:2912 src/flac_header.c:299 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
+msgid "%d kb/s"
+msgstr "%d kb/s"
+
+#. Samplerate
+#: src/et_core.c:2917 src/flac_header.c:304 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:3057
+#, c-format
+msgid ""
+"Could not convert filename : '%s'\n"
+"into system filename encoding\n"
+"(Try setting the environment variable G_FILENAME_ENCODING)."
+msgstr ""
+"Ne mogu da prevedem ime datoteke : „%s“\n"
+"u kodiranje potrebno za sistem datoteka\n"
+"(Pokušajte da namestite promenljivu G_FILENAME_ENCODING)."
+
+#: src/et_core.c:3060 src/scan.c:664
+msgid "Filename translation"
+msgstr "Prevodi imena datoteke"
+
+#: src/et_core.c:4536 src/et_core.c:4544
+#, 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"
+
+#. Nothing to display
+#. gtk_label_set_text(GTK_LABEL(VersionLabel),"");
+#. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
+#. Version changed to encoder version
+#. Encoder version
+#: src/flac_header.c:295 src/monkeyaudio_header.c:96 src/musepack_header.c:98
+#: src/ogg_header.c:245 src/wavpack_header.c:72
+msgid "Encoder:"
+msgstr "Koder:"
+
+#. Mode
+#. Mode
+#. mpeg4ip library seems to always return -1
+#. Mode
+#: src/flac_header.c:309 src/mp4_header.c:286 src/ogg_header.c:267
+#: src/wavpack_header.c:88
+msgid "Channels:"
+msgstr "Kanala:"
+
+#: src/flac_tag.c:140 src/flac_tag.c:741
+#, 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:983 src/ogg_tag.c:752
+#, 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:990 src/ogg_tag.c:759
+#, c-format
+msgid "Written tag of '%s'"
+msgstr "Upisana oznaku u „%s“"
+
+#: src/id3_tag.c:484
+#, c-format
+msgid "Removed tag of '%s'"
+msgstr "Uklonjena oznaka iz „%s“"
+
+#: src/id3_tag.c:488 src/id3_tag.c:585
+#, 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:490 src/id3_tag.c:557
+#, 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:509
+#, 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:531
+#, c-format
+msgid ""
+"You have tried to save this tag to Unicode but it was detected that your "
+"version of id3lib is bugged.\n"
+"If you reload this file, some characters in the tag may be not displayed "
+"correctly...\n"
+"Please, apply to id3lib the patch src/id3lib/"
+"patch_id3lib_3.8.3_UTF16_writing_bug.diff\n"
+"available in EasyTAG package sources.\n"
+"Note that this message will appear only one time.\n"
+"\n"
+"File : %s"
+msgstr ""
+"Pokušali ste da sačuvate oznaku kao unikod ali je nađeno da vaša verzija "
+"id3lib-a sadrži grešku.\n"
+"Ukoliko ponovo učitate ovu datoteku, neki karakteri u oznaci možda neće biti "
+"prikazani ispravno...\n"
+"Molimo vas da, primenite zakrpu src/id3lib/"
+"patch_id3lib_3.8.3_UTF16_writing_bug.diff na id3lib\n"
+"dostupnu u izvornom kodu EasyTAG-a.\n"
+"Ova poruka će se prikazati samo jedanput!.\n"
+"\n"
+"Datoteka : %s"
+
+#: src/id3_tag.c:577
+#, 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:591
+#, c-format
+msgid "Updated tag of '%s'"
+msgstr "Oznaka u „%s“ promenjena"
+
+#: src/id3_tag.c:610
+msgid "No error reported"
+msgstr "Nisu prijavljene greške"
+
+#: src/id3_tag.c:612
+msgid "No available memory"
+msgstr "Nemate dostupnu memoriju"
+
+#: src/id3_tag.c:614
+msgid "No data to parse"
+msgstr "Nema podataka za obradu"
+
+#: src/id3_tag.c:616
+msgid "Improperly formatted data"
+msgstr "Neispravno formatirani podaci"
+
+#: src/id3_tag.c:618
+msgid "No buffer to write to"
+msgstr "Nema bafera za upis"
+
+#: src/id3_tag.c:620
+msgid "Buffer is too small"
+msgstr "Bafer je suviše malo"
+
+#: src/id3_tag.c:622
+msgid "Invalid frame ID"
+msgstr "Neispravan ID okvira"
+
+#: src/id3_tag.c:624
+msgid "Requested field not found"
+msgstr "Zatraženo polje nije nađeno"
+
+#: src/id3_tag.c:626
+msgid "Unknown field type"
+msgstr "Nepoznat tip polja"
+
+#: src/id3_tag.c:628
+msgid "Tag is already attached to a file"
+msgstr "Oznaka je već dodana datoteci"
+
+#: src/id3_tag.c:630
+msgid "Invalid tag version"
+msgstr "Neispravna verzija oznake"
+
+#: src/id3_tag.c:632
+msgid "No file to parse"
+msgstr "Nema datoteke za obradu"
+
+#: src/id3_tag.c:634
+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:636
+msgid "Error in compression/uncompression"
+msgstr "Greška pri kompresiji/dekompresiji"
+
+#: src/id3_tag.c:638
+msgid "Unknown error message!"
+msgstr "Nepoznata poruka o grešci!"
+
+#: src/id3_tag.c:1212
+#, 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 ""
+"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:1214
+msgid "Corrupted file..."
+msgstr "Oštećena datoteka"
+
+#: src/log.c:91
+msgid "Log"
+msgstr "Dnevnik izmena"
+
+#: src/misc.c:214
+msgid " OK "
+msgstr "U redu"
+
+#: src/misc.c:219
+msgid " Yes "
+msgstr "Da"
+
+#: src/misc.c:224
+msgid " No "
+msgstr "Ne"
+
+#: src/misc.c:229
+msgid " Apply "
+msgstr "Primeni"
+
+#: src/misc.c:234
+msgid " Save "
+msgstr "Sačuvaj"
+
+#: src/misc.c:239
+msgid " Cancel "
+msgstr "Zanemari"
+
+#: src/misc.c:244
+msgid " Close "
+msgstr "Zatvori"
+
+#: src/misc.c:249
+msgid " Write "
+msgstr "Upiši"
+
+#: src/misc.c:254
+msgid " Execute "
+msgstr "Pokreni"
+
+#: src/misc.c:259
+msgid " Search "
+msgstr "Traži"
+
+#: src/misc.c:264
+msgid " Browse... "
+msgstr "Nađi..."
+
+#: src/misc.c:856
+msgid "Select directory..."
+msgstr "Odaberi direktorijum..."
+
+#: src/misc.c:861
+msgid "Select file..."
+msgstr "Odaberi datoteku..."
+
+#: src/misc.c:931
+msgid "Warning..."
+msgstr "Upozorenje..."
+
+#: src/misc.c:931
+msgid "No audio player defined!"
+msgstr "Nije definisan program za reprodukciju zvuka!"
+
+#: src/misc.c:1033
+#, 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:1198 src/misc.c:1217
+msgid "B"
+msgstr "B"
+
+#: src/misc.c:1198 src/misc.c:1217
+msgid "KB"
+msgstr "KB"
+
+#: src/misc.c:1198 src/misc.c:1217
+msgid "MB"
+msgstr "MB"
+
+#: src/misc.c:1198 src/misc.c:1217
+msgid "GB"
+msgstr "GB"
+
+#: src/misc.c:1198 src/misc.c:1217
+msgid "TB"
+msgstr "TB"
+
+#: src/misc.c:1312
+msgid "Generate a playlist"
+msgstr "Načini listu numera"
+
+#: src/misc.c:1336
+msgid "M3U Playlist Name"
+msgstr "Ime M3U liste numera"
+
+#: src/misc.c:1349
+msgid "Use directory name"
+msgstr "Koristi ime direktorijuma"
+
+#: src/misc.c:1373 src/misc.c:1470
+msgid "Edit Masks"
+msgstr "Uredi maske"
+
+#. Playlist options
+#: src/misc.c:1381
+msgid "Playlist Options"
+msgstr "Opcije liste numera"
+
+#: src/misc.c:1387
+msgid "Include only the selected files"
+msgstr "Uključi samo izabrane datoteke"
+
+#: src/misc.c:1390
+msgid ""
+"If activated, only the selected files will be written in the playlist file. "
+"Else, all the files will be written."
+msgstr ""
+"Ukoliko je aktivirano, samo izabrane datoteke će biti upisane u listu "
+"numera. U suprotnom, sve datoteke će biti upisane."
+
+#: src/misc.c:1397
+msgid "Use full path for files in playlist"
+msgstr "Koristi pune putanje za datoteke u listi numera"
+
+#: src/misc.c:1400
+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:1410
+msgid "Create playlist in the parent directory"
+msgstr "Načini listu numera u roditeljskom direktorijumu"
+
+#: src/misc.c:1413
+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:1417
+msgid "Use DOS directory separator"
+msgstr "Koristi DOS-ov razdvajač datoteka"
+
+#: src/misc.c:1422
+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:1431
+msgid "Playlist Content"
+msgstr "Sadržaj liste numera"
+
+#: src/misc.c:1437
+msgid "Write only list of files"
+msgstr "Upiši samo listu datoteka"
+
+#: src/misc.c:1441
+msgid "Write info using filename"
+msgstr "Upiši informacije koristeći ime datoteke"
+
+#: src/misc.c:1444
+msgid "Write info using :"
+msgstr "Upiši informacije koristeći :"
+
+#: src/misc.c:1704
+#, c-format
+msgid ""
+"Playlist file '%s' already exists!\n"
+"Overwrite?"
+msgstr ""
+"Datoteka sa listom numera „%s“ već postoji!\n"
+"Da je prepišem?"
+
+#: src/misc.c:1705
+msgid "Write Playlist..."
+msgstr "Upisujem listu numera..."
+
+#. Writing fails...
+#: src/misc.c:1719
+#, c-format
+msgid ""
+"Can't write playlist file '%s'!\n"
+"(%s)"
+msgstr ""
+"Ne mogu da upišem listu numera „%s“!\n"
+"(%s)"
+
+#: src/misc.c:1726
+#, c-format
+msgid "Written playlist file '%s'"
+msgstr "Lista numera „%s“ je načinjena"
+
+#: src/misc.c:1962
+msgid "CD"
+msgstr "CD"
+
+#: src/misc.c:1964
+msgid "Track"
+msgstr "Numera"
+
+#: src/misc.c:1967 src/picture.c:821
+msgid "Composer"
+msgstr "Kompozitor"
+
+#: src/misc.c:1968
+msgid "Orig. Artist"
+msgstr "Orig. izvođač"
+
+#: src/misc.c:1969
+msgid "Copyright"
+msgstr "Autorsko pravo"
+
+#: src/misc.c:1970
+msgid "URL"
+msgstr "URL"
+
+#: src/misc.c:1971
+msgid "Encoded by"
+msgstr "Kodirano pomoću"
+
+#: src/misc.c:1982
+msgid "Search a file"
+msgstr "Nađi datoteku"
+
+#: src/misc.c:2022
+msgid ""
+"Type the word to search into files. Or type nothing to display all files."
+msgstr ""
+"Unesi reči za pretragu unutar datoteka. Ili ne unosi ništa za prikaz svih "
+"datoteka."
+
+#. Where...
+#: src/misc.c:2028
+msgid "In :"
+msgstr "U :"
+
+#: src/misc.c:2031
+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:2033
+msgid "the Tag"
+msgstr "oznaka"
+
+#. Property of the search
+#: src/misc.c:2043 src/prefs.c:323
+msgid "Case sensitive"
+msgstr "Razlikuj velika i mala lova"
+
+#: src/misc.c:2476
+#, c-format
+msgid "Found : %d file(s)"
+msgstr "Nađena(o) : %d datoteka(e)"
+
+#: src/misc.c:2739
+msgid "Load the filenames from a TXT file"
+msgstr "Učitaj imena datoteka iz tekstualnog fajla"
+
+#: src/misc.c:2769
+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:2787
+msgid " Load "
+msgstr "Učitaj"
+
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "Potvrdi preimenovanje datoteke"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, 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:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Ukloni ovaj red"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "Ukloni sve prazne redove"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, 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:2870 src/misc.c:2964
+#, 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:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Osveži"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Upiši samo listu datoteka"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Izaberi sve redove"
+
+#: src/misc.c:3016
+msgid ""
+"When activating this option, after loading the filenames, the current "
+"selected scanner will be ran (the scanner window must be opened)."
+msgstr ""
+"Aktiviranjem ove opcije, nakon učitavanja imena datoteka, trenutno izabrani "
+"skener će biti pokrenut (prozor skenera mora biti otvoreno)."
+
+#: src/misc.c:3403
+msgid "Insert a blank line"
+msgstr "Unesi prazan red"
+
+#: src/misc.c:3409
+msgid "Delete this line"
+msgstr "Ukloni ovaj red"
+
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Pomeri masku nagore"
+
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Pomeri masku nadole"
+
+#. Mode changed to profile name
+#: src/monkeyaudio_header.c:78 src/musepack_header.c:80
+msgid "Profile:"
+msgstr "Profil:"
+
+#: src/mp4_header.c:130
+msgid "Audio"
+msgstr "Audio"
+
+#: src/mp4_header.c:131
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+msgid "MP4 format invalid"
+msgstr "MP4 format neispravan"
+
+#: src/mp4_header.c:273 src/mpeg_header.c:365
+#, c-format
+msgid "~%d kb/s"
+msgstr "~%d kb/s"
+
+#: src/mpeg_header.c:78
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/mpeg_header.c:79
+msgid "Joint stereo"
+msgstr "Pridruženi stereo"
+
+#: src/mpeg_header.c:80
+msgid "Dual channel"
+msgstr "Dva kanala"
+
+#: src/mpeg_header.c:81
+msgid "Single channel"
+msgstr "Jedan kanal"
+
+#. mb->icon = icon;
+#: src/msgbox.c:135
+msgid "Repeat action for the rest of the files"
+msgstr "Ponovi operaciju na ostatak datoteka"
+
+#: src/ogg_header.c:100
+#, c-format
+msgid ""
+"Ogg Vorbis: The specified bitstream does not exist or the file has been "
+"initialized improperly (file: '%s')."
+msgstr ""
+"Ogg Vorbis: Izabrani bitski tok ne postoji ili je datoteka loše započeta "
+"(datoteka: „%s“)."
+
+#: src/ogg_header.c:131
+#, c-format
+msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
+msgstr "Ogg Vorbis: Čitanje sa medijuma je izazvalo grešku (datoteka: „%s“)."
+
+#: src/ogg_header.c:134
+#, c-format
+msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
+msgstr "Ogg Vorbis: Bitski tok nije tipa Vorbis (datoteka: „%s“)."
+
+#: src/ogg_header.c:137
+#, c-format
+msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
+msgstr "Ogg Vorbis: Verzija Vorbis-a se ne poklapa (datoteka: „%s“)."
+
+#: src/ogg_header.c:140
+#, c-format
+msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
+msgstr "Ogg Vorbis: Pogrešno zaglavlje Vorbis bitskog toka (datoteka: „%s“)."
+
+#: src/ogg_header.c:143
+#, c-format
+msgid ""
+"Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack corruption "
+"(file: '%s')."
+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:181 src/ogg_tag.c:573
+#, 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:163
+#, c-format
+msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
+msgstr "Upozorenje : Ogg Vorbis datoteka „%s“ sadrži ID3v2 oznaku."
+
+#: src/picture.c:293
+msgid "Add pictures"
+msgstr "Dodaj slike"
+
+#: src/picture.c:303 src/picture.c:661
+msgid "All Files"
+msgstr "Sve datoteke"
+
+#: src/picture.c:309 src/picture.c:667
+msgid "PNG and JPEG"
+msgstr "PNG i JPEG"
+
+#: src/picture.c:445
+#, c-format
+msgid "Picture Properties %d/%d"
+msgstr "Postavke slike %d/%d"
+
+#: src/picture.c:475
+msgid "Picture Type"
+msgstr "Tip slike"
+
+#. Description
+#: src/picture.c:532
+msgid "Picture Description:"
+msgstr "Opis slike:"
+
+#: src/picture.c:649
+#, c-format
+msgid "Save picture %d/%d"
+msgstr "Sačuvaj sliku %d/%d"
+
+#: src/picture.c:732
+#, c-format
+msgid ""
+"The following file already exists :\n"
+"'%s'\n"
+"Do you want to overwrite?"
+msgstr ""
+"Sledeća datoteka već postoji :\n"
+"„%s“\n"
+"Želite li da je prepišete?"
+
+#: src/picture.c:734
+msgid "Save file..."
+msgstr "Sačuvaj datoteku..."
+
+#: src/picture.c:786
+msgid "JPEG image"
+msgstr "JPEG slika"
+
+#: src/picture.c:788
+msgid "PNG image"
+msgstr "PNG slika"
+
+#: src/picture.c:790
+msgid "Unknown image"
+msgstr "Nepoznata slika"
+
+#: src/picture.c:801
+msgid "32x32 pixel PNG file icon"
+msgstr "PNG ikonica, 32x32 piksela"
+
+#: src/picture.c:803
+msgid "Other file icon"
+msgstr "Ostale ikonice datoteke"
+
+#: src/picture.c:805
+msgid "Cover (front)"
+msgstr "Omot (lice)"
+
+#: src/picture.c:807
+msgid "Cover (back)"
+msgstr "Omot (poleđina)"
+
+#: src/picture.c:809
+msgid "Leaflet page"
+msgstr "Strana sa letkom"
+
+#: src/picture.c:811
+msgid "Media (e.g. label side of CD)"
+msgstr "Medijum (pr. strana sa natpisom CD-a)"
+
+#: src/picture.c:813
+msgid "Lead artist/lead performer/soloist"
+msgstr "Vodeći umetnik/vodeći izvođač/solista"
+
+#: src/picture.c:815
+msgid "Artist/performer"
+msgstr "Umetnik/Izvođač"
+
+#: src/picture.c:817
+msgid "Conductor"
+msgstr "Dirigent"
+
+#: src/picture.c:819
+msgid "Band/Orchestra"
+msgstr "Bend/Orkestar"
+
+#: src/picture.c:823
+msgid "Lyricist/text writer"
+msgstr "Autor tekstova"
+
+#: src/picture.c:825
+msgid "Recording location"
+msgstr "Mesto snimanja"
+
+#: src/picture.c:827
+msgid "During recording"
+msgstr "U toku snimanja"
+
+#: src/picture.c:829
+msgid "During performance"
+msgstr "U toku izvođenja"
+
+#: src/picture.c:831
+msgid "Movie/video screen capture"
+msgstr "Film/Video zapis"
+
+#: src/picture.c:833
+msgid "A bright coloured fish"
+msgstr "Svetlo obojena riba"
+
+#: src/picture.c:835
+msgid "Illustration"
+msgstr "Ilustracija"
+
+#: src/picture.c:837
+msgid "Band/Artist logotype"
+msgstr "Logo benda/izvođača"
+
+#: src/picture.c:839
+msgid "Publisher/studio logotype"
+msgstr "Logo izdavača/studija"
+
+#: src/picture.c:841
+msgid "Unknown picture type"
+msgstr "Nepoznati tip slike"
+
+#: src/picture.c:869 src/picture.c:880
+msgid "pixels"
+msgstr "piksela"
+
+#: src/picture.c:870 src/picture.c:881
+msgid "Type"
+msgstr "Tip"
+
+#: src/picture.c:882
+msgid "Description"
+msgstr "Opis"
+
+#: src/picture.c:984
+msgid ""
+"Can't display the picture, as not enough data has been read to determine how "
+"to create the image buffer."
+msgstr ""
+"Ne mogu da prikažem sliku jer je nedovoljno podataka učitano da bih znao "
+"kako da napravim bafer slike."
+
+#: src/picture.c:987
+msgid "Loading Picture File..."
+msgstr "Učitavam datoteku sa slikom..."
+
+#: src/picture.c:1081
+#, c-format
+msgid ""
+"Can't open file :\n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"Ne mogu da otvorim datoteku :\n"
+"„%s“!\n"
+"(%s)"
+
+#: src/picture.c:1089
+msgid "Picture file not loaded..."
+msgstr "Datoteka sa slikom nije učitana..."
+
+#. Title
+#: src/prefs.c:118
+msgid "Preferences..."
+msgstr "Postavke..."
+
+#. File Browser frame
+#: src/prefs.c:156
+msgid "File Browser"
+msgstr "Razgledač datoteka"
+
+#. Label
+#: src/prefs.c:167
+msgid "Default directory :"
+msgstr "Podrazumevani direktorijum:"
+
+#: src/prefs.c:179
+msgid ""
+"Specify the directory where your files are located. This path will be loaded "
+"when EasyTAG starts without parameter."
+msgstr ""
+"Odredi direktorijum gde se nalaze vaše datoteke. Ova putanja će biti učitana "
+"pri pokretanju EasyTAG-a bez zadatih parametara."
+
+#. Load directory on startup
+#: src/prefs.c:200
+msgid ""
+"Load on startup the default directory or the directory passed as argument"
+msgstr ""
+"Učitaj podrazumevani direktorijum ili direktorijum zadat kao argument po "
+"pokretanju programa."
+
+#: src/prefs.c:203
+msgid ""
+"Automatically search files, when EasyTAG starts, into the default directory. "
+"Note that this path may be overriden by the parameter passed to easytag "
+"(easytag /path_to/mp3_files)."
+msgstr ""
+"Automatski traži datoteke u podrazumevanom direktorijumu kada se pokrene "
+"EasyTAG. Ova putanja može biti prepisana parametrom prosleđenim programu "
+"(easytag /putanja_do/mp3_datoteka)."
+
+#. Browse subdirectories
+#: src/prefs.c:208
+msgid "Search subdirectories"
+msgstr "Pretraži pod-direktorijume"
+
+#: src/prefs.c:211
+msgid "Search subdirectories for files when reading a directory into the tree."
+msgstr ""
+"Traži datoteke i u pod-direktorijumima pri učitavanju direktorijuma u "
+"stablo. "
+
+#. Open the node to show subdirectories
+#: src/prefs.c:215
+msgid "Show subdirectories when selecting a directory"
+msgstr "Prikaži pod-direktorijume pri izboru direktorijuma"
+
+#: src/prefs.c:219
+msgid ""
+"This expands the selected node into the file browser to display the sub-"
+"directories."
+msgstr ""
+"Ovo proširuje izabrani čvor u razgledaču datoteka da bi prikazao pod-"
+"direktorijume."
+
+#. Browse hidden directories
+#: src/prefs.c:223
+msgid "Search hidden directories"
+msgstr "Pretraži skrivene direktorijume"
+
+#: src/prefs.c:228
+msgid "Search hidden directories for files (directories starting by a '.')."
+msgstr ""
+"Traži datoteke u skrivenim direktorijumima (direktorijumima koji počinju sa "
+"„.“)."
+
+#. User interface
+#: src/prefs.c:247
+msgid "User Interface"
+msgstr "Korisničko okruženje"
+
+#. Show header infos
+#: src/prefs.c:254
+msgid "Show header informations of file"
+msgstr "Prikaži informacije zaglavlja datoteke"
+
+#: src/prefs.c:257
+msgid ""
+"If activated, informations about the file as the bitrate, the time, the "
+"size, will be displayed under the filename entry."
+msgstr ""
+"Ukoliko je aktivirano, informacije o datotekama kao što su bitski protok, "
+"vreme, veličina će biti prikazane ispod dela sa imenom datoteke."
+
+#: src/prefs.c:264
+msgid "Display changed files in list using :"
+msgstr "Prikaži izmenjene datoteke u listi koristeći :"
+
+#: src/prefs.c:267
+msgid "Red color"
+msgstr "Crvena boja"
+
+#: src/prefs.c:273
+msgid "Bold style"
+msgstr "Podebljano"
+
+#. Sorting List Options
+#: src/prefs.c:279
+msgid "Sorting List Options"
+msgstr "Opcije sortiranja liste"
+
+#. Sorting method
+#: src/prefs.c:289
+msgid "Sort the file list by :"
+msgstr "Sortiraj listu datoteka :"
+
+#. Two columns
+#. Items of option menu
+#: src/prefs.c:300
+msgid "Ascending file name"
+msgstr "Rastući, po imenu datoteka"
+
+#: src/prefs.c:301
+msgid "Descending file name"
+msgstr "Opadajući, po imenu datoteka"
+
+#: src/prefs.c:302
+msgid "Ascending track number"
+msgstr "Rastući, po broju numere"
+
+#: src/prefs.c:303
+msgid "Descending track number"
+msgstr "Opadajući, po broju numere"
+
+#: src/prefs.c:304
+msgid "Ascending creation date"
+msgstr "Rastući, po vremenu nastanka"
+
+#: src/prefs.c:305
+msgid "Descending creation date"
+msgstr "Opadajući, po vremenu nastanka"
+
+#: src/prefs.c:306
+msgid "Ascending title"
+msgstr "Rastući, po nazivu"
+
+#: src/prefs.c:307
+msgid "Descending title"
+msgstr "Opadajući, po nazivu"
+
+#: src/prefs.c:308
+msgid "Ascending artist"
+msgstr "Rastući, po izvođaču"
+
+#: src/prefs.c:309
+msgid "Descending artist"
+msgstr "Opadajući, po izvođaču"
+
+#: src/prefs.c:310
+msgid "Ascending album"
+msgstr "Rastući, po albumu"
+
+#: src/prefs.c:311
+msgid "Descending album"
+msgstr "Opadajući, po albumu"
+
+#: src/prefs.c:312
+msgid "Ascending year"
+msgstr "Rastući, po godini"
+
+#: src/prefs.c:313
+msgid "Descending year"
+msgstr "Opadajući, po godini"
+
+#: src/prefs.c:314
+msgid "Ascending genre"
+msgstr "Rastući, po žanru"
+
+#: src/prefs.c:315
+msgid "Descending genre"
+msgstr "Opadajući, po žanru"
+
+#: src/prefs.c:316
+msgid "Ascending comment"
+msgstr "Rastući, po komentaru"
+
+#: src/prefs.c:317
+msgid "Descending comment"
+msgstr "Opadajući, po komentaru"
+
+#: src/prefs.c:320
+msgid "Select the type of file sorting when loading a directory."
+msgstr "Izaberi tip sortiranja datoteka pri učitavanju direktorijuma."
+
+#: src/prefs.c:329
+msgid "If activated, the sorting of the list will be dependent on the case."
+msgstr ""
+"Ukoliko je aktivirano, sortiranje liste će biti vršeno po određenim uslovima."
+
+#. Message Dialog Position
+#: src/prefs.c:333
+msgid "Message Dialog Position"
+msgstr "Pozicija prozora za obaveštenja"
+
+#: src/prefs.c:341
+msgid "No particular position"
+msgstr "Bez posebne pozicije"
+
+#: src/prefs.c:345
+msgid "Let the Window Manager to place the windows."
+msgstr "Prepusti pozicioniranje upravniku prozorima."
+
+#: src/prefs.c:350
+msgid "Center of the main window"
+msgstr "Centar glavnog prozora"
+
+#: src/prefs.c:354
+msgid "Windows should be placed in the center of the main window."
+msgstr "Prozori će verovatno biti postavljeni u sredini glavnog prozora."
+
+#: src/prefs.c:359
+msgid "Center of the screen"
+msgstr "Centar ekrana"
+
+#: src/prefs.c:363
+msgid "Windows should be placed in the center of the screen."
+msgstr "Prozori će biti postavljeni u sredini ekrana."
+
+#: src/prefs.c:368
+msgid "Mouse position"
+msgstr "Pozicija kursora"
+
+#: src/prefs.c:372
+msgid "Windows should be placed at the current mouse position."
+msgstr "Prozori će biti postavljeni na trenutnu poziciju kursora."
+
+#. File Player
+#: src/prefs.c:376
+msgid "File Audio Player"
+msgstr "Program za reprodukciju zvuka"
+
+#: src/prefs.c:388
+msgid "Player to run :"
+msgstr "Svirač za pokretanje:"
+
+#: src/prefs.c:393
+msgid ""
+"Enter the program used to play the files. Some arguments can be passed for "
+"the program (as 'xmms -p') before to receive files as other arguments."
+msgstr ""
+"Unesi program koji će biti korišćen za reprodukciju datoteka. Neki argumenti "
+"mogu biti prosleđeni programu (npr. „xmms -p“) pre dobijanja datoteka kao "
+"poslednjeg argumenta."
+
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Opcije oznake"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "Centar glavnog prozora"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr ""
+"Ukoliko je aktivirano, lista će biti načinjena u roditeljskom direktorijumu."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
+#.
+#. * File Settings
+#.
+#: src/prefs.c:447 src/prefs.c:448
+msgid "File Settings"
+msgstr "Podešavanje datoteka"
+
+#. File (name) Options
+#: src/prefs.c:458
+msgid "File Options"
+msgstr "Opcije datoteka"
+
+#: src/prefs.c:464
+msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
+msgstr ""
+"Zameni nedozvoljene karaktere u imenu datoteke (za Windows i CD uređaje)"
+
+#: src/prefs.c:467
+msgid ""
+"Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
+"('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
+"problem when renaming the file. This is usefull when renaming the file from "
+"the tag with the scanner."
+msgstr ""
+"Zameni nedozvoljene karaktere za FAT32/16 i ISO9660 + Joliet sistem datoteka "
+"(„\\“, „:“, „;“, „*“, „?“, „\", „<“, „>“, „|“) u svakom imenu datoteke da bi "
+"izbegao probleme sa preimenovanjem datoteke. Ovo je korisno pri "
+"preimenovanju datoteka iz oznaka, skenerom."
+
+#. Extension case (lower/upper?)
+#: src/prefs.c:476
+msgid "Convert filename extension to :"
+msgstr "Promeni ekstenziju datoteke u :"
+
+#: src/prefs.c:479
+msgid "Lower Case"
+msgstr "Mala slova"
+
+#: src/prefs.c:482
+msgid "For example, the extension will be converted to '.mp3'"
+msgstr "Na primer, ekstenzija će biti preimenovana u „.mp3“"
+
+#: src/prefs.c:485
+msgid "Upper Case"
+msgstr "Velika slova"
+
+#: src/prefs.c:488
+msgid "For example, the extension will be converted to '.MP3'"
+msgstr "Na primer, ekstenzija će biti preimenovana u „.MP3“"
+
+#: src/prefs.c:491
+msgid "No Change"
+msgstr "Bez izmene"
+
+#: src/prefs.c:494
+msgid "The extension will not be converted"
+msgstr "Ekstenzija neće biti preimenovana"
+
+#. Preserve modification time
+#: src/prefs.c:497
+msgid "Preserve modification time of the file"
+msgstr "Ne menjaj vreme izmene datoteke"
+
+#: src/prefs.c:500
+msgid ""
+"Preserve the modification time (in file properties) when saving the file."
+msgstr ""
+"Ne menjaj vreme izmene datoteke (u osobinama datoteke) pri čuvanju datoteke."
+
+#. Change directory modification time
+#: src/prefs.c:504
+msgid ""
+"Update modification time of the parent directory of the file (recommended "
+"when using Amarok)"
+msgstr ""
+"Promeni vreme izmene roditeljskog direktorijuma datoteke (preporučljivo ako "
+"koristite Amarok)"
+
+#: src/prefs.c:508
+msgid ""
+"The modification time of the parent directory of the file will be updated "
+"when saving tag the file. At the present time it is automatically done only "
+"when renaming a file.\n"
+"This feature is interesting when using applications like Amarok. For "
+"performance reasons, they refresh file informations by detecting changes of "
+"the parent directory."
+msgstr ""
+"Vreme izmene roditeljskog direktorijuma datoteke će iti promenjeno sledeći "
+"put kada sačuvate tu datoteku.  Danas je to jedino moguće pri preimenovanju "
+"datoteke.\n"
+"Ova opcija je interesantna kada koristite programe za reprodukciju zvuka kao "
+"što je Amarok. Radi bolje performanse, program osvežava informacije samo "
+"kada primeti da su nad nekim direktorijumom izvršene promene."
+
+#. Character Set for File Name
+#: src/prefs.c:516
+msgid "Character Set for File Name"
+msgstr "Set karaktera za imena datoteka"
+
+#. Rules for character set
+#: src/prefs.c:532
+msgid ""
+"Rules to apply if some characters can't be converted to the system character "
+"encoding when writing filename:"
+msgstr ""
+"Pravila za primenjivanje ukoliko neki karakteri ne mogu biti prevedeni u "
+"sistemsko kodiranje pri upisu imena datoteke:"
+
+#: src/prefs.c:540
+msgid "Try an other character encoding"
+msgstr "Probaj drugo kodiranje karaktera"
+
+#: src/prefs.c:544
+msgid ""
+"With this option, it will try the conversion to the encoding associated to "
+"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 ""
+"Sa ovom opcijom pokušaće se prevođenje kodiranja karaktera kako to određuje "
+"vaša lokalizacija sistema (na primer : ISO-8859-1 za „fr“, KOI8-R za „ru“, "
+"ISO-8859-2 za „ro“). Ukoliko ne uspe, pokušaće se sa ISO-8859-1 kodiranjem."
+
+#: src/prefs.c:551
+msgid ""
+"Force using the system character encoding and activate the transliteration"
+msgstr ""
+"Primoraj korišćenje sistemskog kodiranja karaktera i aktiviraj prevođenje "
+"znakova"
+
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it can be approximated through one or several similarly "
+"looking characters."
+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:560
+msgid ""
+"Force using the system character encoding and silently discard some "
+"characters"
+msgstr ""
+"Primoraj korišćenje sistemskog kodiranja karaktera i zanemari neke karaktere"
+
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+msgid ""
+"With this option, when a characters cannot be represented in the target "
+"character set, it will be silently discarded."
+msgstr ""
+"Sa ovom opcijom, kada karakter ne može biti predstavljen željenim setom "
+"karaktera, biće zanemaren bez obaveštavanja o tome."
+
+#.
+#. * Tag Settings
+#.
+#: src/prefs.c:572 src/prefs.c:573
+msgid "Tag Settings"
+msgstr "Postavke oznaka"
+
+#. Tag Options
+#: src/prefs.c:582
+msgid "Tag Options"
+msgstr "Opcije oznake"
+
+#: src/prefs.c:588
+msgid "Auto completion of date if not complete"
+msgstr "Automatska dopuna datuma ako nije ceo"
+
+#: src/prefs.c:591
+msgid ""
+"Try to complete the year field if you enter only the last numerals of the "
+"date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
+"1996, 95 => 1995, ...)."
+msgstr ""
+"Pokušava da popuni polje sa godinom ukoliko unesete samo zadnje decimale "
+"datuma (npr. ukoliko je trenutna godina 2005 broj 5 će biti 2005; 4 => 2004; "
+"6 => 1996; 95 => 1995)."
+
+#: src/prefs.c:598
+msgid "Write the track field with the following number of digits :"
+msgstr "Upiši polje sa brojem numere sledećim brojem decimala:"
+
+#: src/prefs.c:601
+msgid ""
+"If activated, the track field is written using the number '0' as padding to "
+"obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
+"'10',...). Else it keeps the 'raw' track value."
+msgstr ""
+"Ukoliko je aktivirano, polje za broj numere će biti upisano koristeći broj "
+"„0“ kao prefiks za brojeve sa „n“ cifara (npr. za brojeve sa dve cifre „05“, "
+"„09“, „10“...). U suprotnom će broj biti upisan bez prefiksa (npr. „5“, „9“, "
+"„10“...)."
+
+#: src/prefs.c:616
+msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
+msgstr "Ogg Vorbis datoteke : Upiši komentare u XMMS-ov format"
+
+#: src/prefs.c:619
+msgid ""
+"XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
+"files as other apps do. In fact, this field is usually labeled with "
+"'comment=', whereas XMMS uses only `='. Please, uncheck this option if you "
+"don't want other apps to complain about an unknown field. Comments won't be "
+"shown in XMMS, though."
+msgstr ""
+"XMMS nepropisno identifikuje komentare u Ogg Vorbis datotekama, kao što to "
+"čine ostali programi za reprodukciju zvuka. U stvari, ovo polje je obično "
+"označeno sa „comment=vrednost“, gde XMMS koristi samo „=“. Ukoliko ne želite "
+"da se ostali programi žale na postojanje nepoznatog polja de-aktivirajte ovu "
+"opciju. Doduše, komentari neće biti prikazani u XMMS-u."
+
+#: src/prefs.c:634
+msgid ""
+"Tag field focus when switching files in list with shortcuts Page Up/Page "
+"Down:"
+msgstr ""
+"Promeni izbor polja pri promeni datoteke u listi prečicama Page Up/Page Down:"
+
+#: src/prefs.c:643
+msgid "Keep focus to the same tag field"
+msgstr "Tako da zadržiš izbor na polju iste oznake"
+
+#: src/prefs.c:649
+msgid "Return focus to the first tag field (ie 'Title' field)"
+msgstr "Tako da postaviš izbor na prvo polje (tj. na polje „Naslov“)"
+
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(SetFocusToFirstTagField),SET_FOCUS_TO_FIRST_TAG_FIELD);
+#.
+#. * ID3 Tag Settings
+#.
+#: src/prefs.c:657 src/prefs.c:658
+msgid "ID3 Tag Settings"
+msgstr "Postavke ID3 oznaka"
+
+#. Tag Rules frame
+#: src/prefs.c:670
+msgid "ID3 Tag Rules"
+msgstr "Pravila ID3 oznaka"
+
+#. Write ID3 tags in FLAC files
+#: src/prefs.c:682
+msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
+msgstr "Upiši ID3 oznake u FLAC datotekama (kao dodatak FLAC oznakama)"
+
+#: src/prefs.c:685
+msgid ""
+"If activated, ID3 tags will be also added in the FLAC file (according the "
+"two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
+msgstr ""
+"Ukoliko je aktivirano, ID3 oznake će takođe biti dodate FLAC datotekama "
+"(sledeći prethodna pravila, uz postojeću FLAC oznaku). U suprotnom ID3 "
+"oznaka će biti uklonjena."
+
+#. Strip tag when fields (managed by EasyTAG) are empty
+#: src/prefs.c:690
+msgid "Strip tags if all fields are set to blank"
+msgstr "Obriši oznake ako su polja prazna"
+
+#: src/prefs.c:693
+msgid ""
+"As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
+"Genre or Comment (as an attached picture, lyrics, ...), this option allows "
+"you to strip the whole tag when these seven standard data fields have been "
+"set to blank."
+msgstr ""
+"Pošto ID3v2 oznake mogu da sadrže i druge podatke koji ne spadaju u Naslov, "
+"Izvođač, Album, Godina, Žanr, Komentar (kao što su slike, tekstovi,...), ova "
+"opcija vam omogućava da obrišete celu oznaku kada su ova standardna sedam "
+"polja prazna."
+
+#. Convert old ID3v2 tag version
+#: src/prefs.c:699
+msgid "Automatically convert old ID3v2 tag versions"
+msgstr "Automatski prevedi staru ID3v2 verziju oznaka"
+
+#: src/prefs.c:702
+msgid ""
+"If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
+"ID3v2.3 version."
+msgstr ""
+"Ukoliko je aktivirano, stara verzija ID3v2 oznake (kao što je ID3v2.2) će "
+"biti nadograđena na verziju ID3v2.3."
+
+#. Use CRC32
+#: src/prefs.c:706
+msgid "Use CRC32"
+msgstr "Koristi CRC32"
+
+#: src/prefs.c:709
+msgid "Set CRC32 in the ID3v2 tags"
+msgstr "Koristi CRC32 u ID3v2 oznakama."
+
+#. Use Compression
+#: src/prefs.c:712
+msgid "Use Compression"
+msgstr "Koristi pakovanje"
+
+#: src/prefs.c:715
+msgid "Set Compression in the ID3v2 tags"
+msgstr "Koristi pakovanje u ID3v2 oznakama."
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:718
+msgid "Character Set for writing ID3 tags"
+msgstr "Set karaktera za upis ID3 oznaka."
+
+#. ID3v2 tags
+#: src/prefs.c:725
+msgid "ID3v2 tags"
+msgstr "ID3v2 oznake"
+
+#. Write ID3v2 tag
+#: src/prefs.c:738
+msgid "Write ID3v2 tag"
+msgstr "Upiši ID3v2 oznake"
+
+#: src/prefs.c:741
+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 ""
+"Ukoliko je aktivirano, ID3v2.4 oznaka će biti dodata ili promenjena na "
+"početku svake MP3 datoteke. U suprotnom će biti uklonjena."
+
+#. ID3v2 tag version
+#: src/prefs.c:748
+msgid "Version:"
+msgstr "Verzija:"
+
+#: src/prefs.c:755
+msgid ""
+"Select the ID3v2 tag version to write:\n"
+" - ID3v2.3 is written using id3lib,\n"
+" - ID3v2.4 is written using libid3tag (recommended)."
+msgstr ""
+"Izaberi ID3v2 oznaku za upis:\n"
+" - ID3v2.3 je upisana koristeći id3lib,\n"
+" - ID3v2.4 je upisana koristeći libid3tag (preporučljivo)."
+
+#. Charset
+#. Id3V1 writing character set
+#: src/prefs.c:769 src/prefs.c:867
+msgid "Charset:"
+msgstr "Set karaktera:"
+
+#. Unicode
+#: src/prefs.c:777
+msgid "Unicode "
+msgstr "Unikod"
+
+#: src/prefs.c:785
+msgid "Unicode type to use"
+msgstr "Tip Unikoda koji da koristim."
+
+#: src/prefs.c:808
+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:883
+msgid "Additional settings for iconv():"
+msgstr "Dodatne postavke za iconv():"
+
+#: src/prefs.c:822 src/prefs.c:888
+msgid "No"
+msgstr "Ne"
+
+#: src/prefs.c:827 src/prefs.c:893
+msgid "//TRANSLIT"
+msgstr "Prevedi"
+
+#: src/prefs.c:836 src/prefs.c:902
+msgid "//IGNORE"
+msgstr "Ignoriši"
+
+#. ID3v1 tags
+#: src/prefs.c:844
+msgid "ID3v1 tags"
+msgstr "ID3v1 oznake"
+
+#. Write ID3v1 tag
+#: src/prefs.c:858
+msgid "Write ID3v1.x tag"
+msgstr "Upiši ID3v1.x oznaku"
+
+#: src/prefs.c:861
+msgid ""
+"If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
+"files. Else it will be stripped."
+msgstr ""
+"Ukoliko je aktivirano, ID3v1 oznaka će biti dodata ili promenjena na kraju "
+"MP3 datoteka. U suprotnom će biti uklonjena."
+
+#: src/prefs.c:878
+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:910
+msgid "Character Set for reading ID3 tags"
+msgstr "Set karaktera za čitanje ID3 oznaka."
+
+#: src/prefs.c:924
+msgid "Non-standart:"
+msgstr "Nestandardno:"
+
+#: src/prefs.c:929
+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: "
+"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"
+"  - If unicode was not used, Russian people can select the character set "
+"'Windows-1251' to load tags written under Windows. And 'KOI8-R' to load tags "
+"written under Unix systems."
+msgstr ""
+"Ovaj set karaktera će biti korišćen pri čitanju podataka za prevođenje "
+"svakog karaktera nađenog u ISO-8859-1 polju oznake (na primer ID3v2 i/ili "
+"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 "
+"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"
+" - ukoliko Unikod nije korišćen, Rusi mogu odabrati „Windows-1251“ set za "
+"čitanje oznaka upisanih pod Windows-om, ili „KOI8-R“ za čitanje oznaka "
+"upisanim pod Uniks sistemima."
+
+#: src/prefs.c:947
+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:962 src/prefs.c:963
+msgid "Scanner"
+msgstr "Skener"
+
+#. Character conversion for the 'Fill Tag' scanner (=> FTS...)
+#: src/prefs.c:975
+msgid "Fill Tag Scanner - Character Conversion"
+msgstr "Skener za popunjavanje oznake - prevođenje karaktera"
+
+#: src/prefs.c:981 src/prefs.c:1007
+msgid "Convert underscore character '_' and string '%20' to space ' '"
+msgstr "Prevedi donje crtice „_“ i karakter „%20“ u razmak „ “"
+
+#: src/prefs.c:983 src/prefs.c:1009
+msgid "Convert space ' ' to underscore '_'"
+msgstr "Prevedi razmak „ “ u dolju crticu „_“"
+
+#: src/prefs.c:995 src/prefs.c:997
+msgid ""
+"If activated, this conversion will be used when applying a mask from the "
+"scanner for tags."
+msgstr ""
+"Ukoliko je aktivirano, ovo prevođenje će biti korišćeno pri primenjivanju "
+"maske iz skenera ili oznaka."
+
+#. Character conversion for the 'Rename File' scanner (=> RFS...)
+#: src/prefs.c:1001
+msgid "Rename File Scanner - Character Conversion"
+msgstr "Skener za promenu imena datotekama - prevođenje karaktera"
+
+#: src/prefs.c:1021 src/prefs.c:1023
+msgid ""
+"If activated, this conversion will be used when applying a mask from the "
+"scanner for filenames."
+msgstr ""
+"Ukoliko je aktivirano, ovo prevođenje će biti korišćeno pri primenjivanju "
+"maske iz skenera ili imena datoteka."
+
+#. Character conversion for the 'Process Fields' scanner (=> PFS...)
+#: src/prefs.c:1027
+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:1034
+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:1038
+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 "
+"word' (for example, you will obtain 'Text in an Entry' instead of 'Text In "
+"An Entry')."
+msgstr ""
+"Nemoj da prevodiš prvo slovo svake reči kao što su engleski predlozi, "
+"članovi i reči tipa feat., kada skener koristi opciju „Prvo slovo svake reči "
+"veliko“ (na primer, dobićete „Text in an Entry“ umesto „Text In An Entry“)."
+
+#. Properties of the scanner window
+#: src/prefs.c:1044
+msgid "Scanner Window"
+msgstr "Prozor skenera"
+
+#: src/prefs.c:1050
+msgid "Open the Scanner Window on startup"
+msgstr "Otvori prozor skenera pri pokretanju programa"
+
+#: src/prefs.c:1053
+msgid ""
+"Activate this option to open automatically the scanner window when EasyTAG "
+"starts."
+msgstr ""
+"Aktiviranje ove opcije će automatski otvoriti prozor skenera pri pokretanju "
+"EasyTAG programa."
+
+#: src/prefs.c:1056
+msgid "Scanner window always on top"
+msgstr "Prozor skenera uvek na vrhu"
+
+#: src/prefs.c:1059
+msgid ""
+"If activated, the window which contains the masks will stay always over the "
+"main window."
+msgstr ""
+"Ukoliko je aktivirano, prozor koji sadrži maske će uvek stajati preko "
+"glavnog prozora."
+
+#. Other options
+#: src/prefs.c:1064
+msgid "Fields"
+msgstr "Polja"
+
+#. Overwrite text into tag fields
+#: src/prefs.c:1071
+msgid "Overwrite fields when scanning tag"
+msgstr "Prepiši sva polja pri skeniranju oznake"
+
+#: src/prefs.c:1074
+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 ""
+"Ukoliko je aktivirano, skener će zameniti postojeći tekst u poljima novim. "
+"Ukoliko nije, samo prazna polja oznaka će biti popunjena."
+
+#: src/prefs.c:1085
+msgid "Set this text as default comment :"
+msgstr "Postavi ovaj tekst kao podrazumevani komentar:"
+
+#: src/prefs.c:1088
+msgid ""
+"Activate this option if you want to put the following string into the "
+"comment field when using the 'Fill Tag' scanner."
+msgstr ""
+"Aktivirajte ovu opciju ukoliko želite da stavite sledeći niz karaktera u "
+"polje komentara pri korišćenju „Skenera za popunjavanje oznaka“"
+
+#. CRC32 comment
+#: src/prefs.c:1105
+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:1109
+msgid ""
+"Calculates the CRC-32 value of the file and writes it into the comment field "
+"when using the 'Fill Tag' scanner."
+msgstr ""
+"Proračunava CRC-32 vrednost datoteka i upisuje ih u polje sa komentarom pri "
+"korišćenju skenera za popunjavanje oznaka."
+
+#.
+#. * CDDB
+#.
+#: src/prefs.c:1120 src/prefs.c:1121
+msgid "CD Data Base"
+msgstr "CD baza podataka"
+
+#. CDDB Server Settings (Automatic Search)
+#: src/prefs.c:1130
+msgid "Server Settings for Automatic Search"
+msgstr "Postavke servera za automatsku pretragu"
+
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+msgid "Name :"
+msgstr "Ime :"
+
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+msgid "Port :"
+msgstr "Port :"
+
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+msgid "CGI Path :"
+msgstr "CGI putanja :"
+
+#. CDDB Server Settings (Manual Search)
+#: src/prefs.c:1204
+msgid "Server Settings for Manual Search"
+msgstr "Postavke servera za ručnu pretragu"
+
+#. Local access for CDDB (Automatic Search)
+#: src/prefs.c:1239
+msgid "Local CD Data Base"
+msgstr "Lokalna CD basa podataka"
+
+#: src/prefs.c:1247
+msgid "Path :"
+msgstr "Putanja :"
+
+#: src/prefs.c:1258
+msgid ""
+"Specify the directory where are located the local cd data base. The local cd "
+"data base contains the eleven following directories 'blues', 'classical', "
+"'country', 'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' "
+"and 'misc'."
+msgstr ""
+"Unesi putanju do direktorijuma gde je sačuvana lokalna baza CD-a. Lokalna "
+"baza sadrži jedanaest direktorijuma „blues“, „classical“, „country“, „data“, "
+"„folk“, „jazz“, „newage“, „reggae“, „rock“, „soundtrack“ i „misc“."
+
+#. CDDB Proxy Settings
+#: src/prefs.c:1284
+msgid "Proxy Settings"
+msgstr "Postavke mrežnog posrednika"
+
+#: src/prefs.c:1293
+msgid "Use a proxy"
+msgstr "Koristi mrežni posrednik"
+
+#: src/prefs.c:1296
+msgid "Set active the settings of the proxy server."
+msgstr "Aktivira postavke mrežnog posrednika."
+
+#: src/prefs.c:1301
+msgid "Host Name :"
+msgstr "Ime posrednika :"
+
+#: src/prefs.c:1308
+msgid "Name of the proxy server."
+msgstr "Ime servera mrežnog posrednika."
+
+#: src/prefs.c:1316
+msgid "Port of the proxy server."
+msgstr "Port mrežnog posrednika"
+
+#: src/prefs.c:1321
+msgid "User Name :"
+msgstr "Korisničko ime :"
+
+#: src/prefs.c:1328
+msgid "Name of user for the the proxy server."
+msgstr "Ime korisnika mrežnog posrednika."
+
+#: src/prefs.c:1329
+msgid "User Password :"
+msgstr "Lozinka :"
+
+#: src/prefs.c:1337
+msgid "Password of user for the the proxy server."
+msgstr "Lozinka korisnika mrežnog posrednika."
+
+#. Track Name list (CDDB results)
+#: src/prefs.c:1342
+msgid "Track Name List"
+msgstr "Lista imena numera"
+
+#: src/prefs.c:1349
+msgid ""
+"Select corresponding audio file (according position or DLM if activated "
+"below)"
+msgstr ""
+"Izaberi odgovarajuću audio datoteku (sudeći po mestu ili DLM-u ukoliko je "
+"aktivirano ispod)"
+
+#: src/prefs.c:1353
+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 ""
+"Ukoliko je aktivirano, pri izboru reda u listi imena numera, odgovarajuća "
+"audio datoteka u glavnoj listi će takođe biti izabrana."
+
+#. Check box to use DLM (also used in the cddb window)
+#: src/prefs.c:1358
+msgid ""
+"Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
+"files (using filename)"
+msgstr ""
+"Koristi Levenštajnov algoritam (DLM) za poklapanje redova (koristeći naslov) "
+"sa audio datotekama (koristeći imena datoteka)"
+
+#.
+#. * Confirmation
+#.
+#: src/prefs.c:1373 src/prefs.c:1374
+msgid "Confirmation"
+msgstr "Potvrde"
+
+#: src/prefs.c:1382
+msgid "Confirm exit from program"
+msgstr "Potvrdi izlazak iz programa"
+
+#: src/prefs.c:1385
+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:1388
+msgid "Confirm writing of file tag"
+msgstr "Potvrdi upis oznake i datoteku"
+
+#: src/prefs.c:1392
+msgid "Confirm renaming of file"
+msgstr "Potvrdi preimenovanje datoteke"
+
+#: src/prefs.c:1396
+msgid "Confirm deleting of file"
+msgstr "Potvrdi brisanje datoteke"
+
+#: src/prefs.c:1400
+msgid "Confirm writing of playlist"
+msgstr "Potvrdi pravljenje liste numera"
+
+#. 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:1422
+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:1431
+msgid "Close this window without saving"
+msgstr "Zatvori ovaj prozor bez čuvanja"
+
+#: src/prefs.c:1439
+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:1472
+#, c-format
+msgid "(Example : %.*d_-_Track_name_1.mp3)"
+msgstr "(Primer:%.*d_-_Ime_numere_1.mp3 )"
+
+#: src/prefs.c:1618
+msgid "Changes applied"
+msgstr "Izmene su primenjene"
+
+#: src/prefs.c:1637 src/setting.c:868
+msgid "Configuration saved"
+msgstr "Postavke su sačuvane"
+
+#: src/prefs.c:1644
+msgid "Configuration unchanged"
+msgstr "Postavke nisu menjane"
+
+#: src/prefs.c:1736
+#, c-format
+msgid ""
+" The selected path for 'Default path to files' isn't valid!\n"
+"'%s'\n"
+"(%s) "
+msgstr ""
+"Izabrana putanja za podrazumevanu stazu do datoteka nije ispravna!n„%s“\n"
+"(%s) "
+
+#: src/prefs.c:1738
+msgid "Not a directory"
+msgstr "Nije direktorijum"
+
+#: src/prefs.c:1839
+#, c-format
+msgid "The audio file player '%s' can't be found!"
+msgstr "Program za reprodukciju zvuka „%s“ nije nađen!"
+
+#: src/scan.c:174
+msgid "Fill Tag"
+msgstr "Popuni oznaku"
+
+#: src/scan.c:175
+msgid "Rename File and Directory"
+msgstr "Preimenuj datoteku i direktorijum"
+
+#: src/scan.c:176
+msgid "Process Fields"
+msgstr "Obradi polja"
+
+#: src/scan.c:353
+msgid "Tag successfully scanned..."
+msgstr "Oznaka uspešno skenirana..."
+
+#: src/scan.c:355
+#, c-format
+msgid "Tag successfully scanned...(%s)"
+msgstr "Oznaka uspešno skenirana... (%s)"
+
+#: src/scan.c:395
+#, 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:477 src/scan.c:506
+#, 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:663
+#, 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:686
+msgid "New file name successfully scanned..."
+msgstr "Novo ime datoteke uspešno skenirano..."
+
+#: src/scan.c:689
+#, c-format
+msgid "New file name successfully scanned...(%s)"
+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:1909
+msgid "Tag and File Name scan"
+msgstr "Skener oznaka i imena datoteka"
+
+#. Option Menu
+#: src/scan.c:1931
+msgid "Scanner:"
+msgstr "Skener:"
+
+#. Selection of the item made at the end of the function
+#: src/scan.c:1953
+msgid "Select the type of scanner to use"
+msgstr "Izaberi tip skenera za upotrebu"
+
+#: src/scan.c:1962
+msgid "Open scanner window / Scan selected files"
+msgstr "Otvori prozor skenera / Skeniraj izabrane datoteke"
+
+#: src/scan.c:1975
+msgid "Scanner Options"
+msgstr "Opcije skenera"
+
+#: src/scan.c:1984
+msgid "Show / Hide Masks Editor"
+msgstr "Prikaži / Sakrij uređivač maski"
+
+#: src/scan.c:1994
+msgid "Show / Hide Legend"
+msgstr "Prikaži / Sakrij legendu"
+
+#: src/scan.c:2004
+msgid "Close this window"
+msgstr "Zatvori ovaj prozor"
+
+#: src/scan.c:2032
+msgid ""
+"Select or type in a mask using codes (see Legend) to parse file name and "
+"path. Used to fill in tag fields."
+msgstr ""
+"Izaberi ili unesi masku koristeći kodove (vidi legendu) za prosleđivanje "
+"imenu datoteke ili putanji. Koristi se za popunjavanje polja oznaka."
+
+#. Preview label
+#: src/scan.c:2058
+msgid "Fill tag preview..."
+msgstr "Pregled popunjavanja oznake..."
+
+#: src/scan.c:2085
+msgid "Prefix mask with current path"
+msgstr "Maska prefiksa sa trenutnom putanjom"
+
+#: src/scan.c:2098
+msgid ""
+"Select or type in a mask using codes (see Legend) to parse tag fields. Used "
+"to rename the file.\n"
+"Use / to make directories. If the first character is /, it's a absolute "
+"path, otherwise is relative to the old path."
+msgstr ""
+"Izaberi ili unesi masku koristeći kodove (vidi legendu) za prosleđivanje "
+"poljima oznaka. Koristi se za preimenovanje datoteka.\n"
+"Koristi / za direktorijume. Ukoliko je prvi karakter /, putanja je "
+"apsolutna, u suprotnoj je relativna u odnosu na staru putanju."
+
+#. Preview label
+#: src/scan.c:2125
+msgid "Rename file preview..."
+msgstr "Pregled preimenovanja datoteke..."
+
+#: src/scan.c:2145
+msgid "Select fields:"
+msgstr "Izaberi polja:"
+
+#: src/scan.c:2148
+msgid ""
+"The buttons on the right represent the fields which can be processed. Select "
+"those who interest you."
+msgstr ""
+"Dugmići desno predstavljaju polja koja mogu biti obrađena. Označite ona koja "
+"vam trebaju."
+
+#. Advice for Translators : set the first letter of filename translated
+#: src/scan.c:2151
+msgid "F"
+msgstr "D"
+
+#: src/scan.c:2152
+msgid "Process file name field"
+msgstr "Obradi polje za ime datoteke."
+
+#. Advice for Translators : set the first letter of title translated
+#: src/scan.c:2154
+msgid "T"
+msgstr "N"
+
+#: src/scan.c:2155
+msgid "Process title field"
+msgstr "Obradi polje „Naslov“."
+
+#. Advice for Translators : set the first letter of artist translated
+#: src/scan.c:2157
+msgid "Ar"
+msgstr "I"
+
+#: src/scan.c:2158
+msgid "Process file artist field"
+msgstr "Obradi polje „Izvođač“."
+
+#. Advice for Translators : set the first letter of album translated
+#: src/scan.c:2160
+msgid "Al"
+msgstr "A"
+
+#: src/scan.c:2161
+msgid "Process album field"
+msgstr "Obradi polje „Album“."
+
+#. Advice for Translators : set the first letter of genre translated
+#: src/scan.c:2163
+msgid "G"
+msgstr "Ž"
+
+#: src/scan.c:2164
+msgid "Process genre field"
+msgstr "Obradi polje „Žanr“."
+
+#. Advice for Translators : set the first letter of comment translated
+#: src/scan.c:2166
+msgid "Cm"
+msgstr "K"
+
+#: src/scan.c:2167
+msgid "Process comment field"
+msgstr "Obradi polje „Komentar“."
+
+#. Advice for Translators : set the first letter of composer translated
+#: src/scan.c:2169
+msgid "Cp"
+msgstr "Kp"
+
+#: src/scan.c:2170
+msgid "Process composer field"
+msgstr "Obradi polje „Kompozitor“."
+
+#. Advice for Translators : set the first letter of orig artist translated
+#: src/scan.c:2172
+msgid "O"
+msgstr "O"
+
+#: src/scan.c:2173
+msgid "Process original artist field"
+msgstr "Obradi polje „Originalni izvođač“."
+
+#. Advice for Translators : set the first letter of copyright translated
+#: src/scan.c:2175
+msgid "Cr"
+msgstr "Ap"
+
+#: src/scan.c:2176
+msgid "Process copyright field"
+msgstr "Obradi polje „Autorsko pravo“."
+
+#. Advice for Translators : set the first letter of URL translated
+#: src/scan.c:2178
+msgid "U"
+msgstr "U"
+
+#: src/scan.c:2179
+msgid "Process URL field"
+msgstr "Obradi polje „URL“."
+
+#. Advice for Translators : set the first letter of encoder name translated
+#: src/scan.c:2181
+msgid "E"
+msgstr "Kd"
+
+#: src/scan.c:2182
+msgid "Process encoder name field"
+msgstr "Obradi polje „Kodirano ponoću“."
+
+#: src/scan.c:2228
+msgid "Invert Selection"
+msgstr "Izaberi obratno"
+
+#: src/scan.c:2237
+msgid "Select/Unselect All."
+msgstr "Izaberi sve/ništa"
+
+#. Group: character conversion
+#: src/scan.c:2244
+msgid "Convert '_' and '%20' to ' '"
+msgstr "Prevedi „_“ i „%20“ u „ “"
+
+#: src/scan.c:2250
+msgid "Convert:"
+msgstr "Prevedi:"
+
+#: src/scan.c:2252
+msgid "to: "
+msgstr "u:"
+
+#: src/scan.c:2281
+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 ""
+"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:2284
+msgid ""
+"The space character is replaced by one underscore character. Example, "
+"before: 'Text In An Entry', after: 'Text_In_An_Entry'."
+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:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
+
+#: src/scan.c:2319
+msgid ""
+"Convert all words in all fields to upper case. Example, before: 'Text IN AN "
+"entry', after: 'TEXT IN AN ENTRY'."
+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:2322
+msgid ""
+"Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
+"entry', after: 'text in an entry'."
+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:2325
+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 ""
+"Prvo slovo svakog polja promeni u veliko. Na primer „tekst U Nekom POLJU“ će "
+"postati „Tekst u nekom polju“."
+
+#: src/scan.c:2328
+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 ""
+"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:2337
+msgid "Insert a space before an uppercase letter"
+msgstr "Umetni razmak pre velikog slova"
+
+#: src/scan.c:2338
+msgid "Remove duplicates of space or underscore"
+msgstr "Ukloni duple razmake ili donje crtice"
+
+#: src/scan.c:2356
+msgid ""
+"All spaces between words are removed. Example, before: 'Text In An Entry', "
+"after: 'TextInAnEntry'."
+msgstr ""
+"Uklanja sve razmake između reči. Na primer „Tekst U Nekom Polju“ će postati "
+"„TekstUNekomPolju“."
+
+#: src/scan.c:2359
+msgid ""
+"A space is inserted before each upper case letter. Example, before: "
+"'TextInAnEntry', after: 'Text In An Entry'."
+msgstr ""
+"Dodaje razmak pre svakog velikog slova. Na primer „TekstUNekomPolju“ će "
+"postati „Tekst U Nekom Polju“."
+
+#: src/scan.c:2362
+msgid ""
+"Duplicated spaces or underscores are removed. Example, before: "
+"'Text__In__An   Entry', after: 'Text_In_An Entry'."
+msgstr ""
+"Uklanja duple razmake ili donje linije. Na primer „Tekst__U__Nekom  Polju“ "
+"će postati „Tekst_U_Nekom Polju“."
+
+#.
+#. * Frame to display codes legend
+#.
+#: src/scan.c:2368
+msgid "Legend"
+msgstr "Legenda"
+
+#: src/scan.c:2374
+#, c-format
+msgid "%a : artist"
+msgstr "%a : izvođač"
+
+#: src/scan.c:2377
+msgid "%b : album"
+msgstr "%b : album"
+
+#: src/scan.c:2380
+#, c-format
+msgid "%c : comment"
+msgstr "%c : komentar"
+
+#: src/scan.c:2383
+#, c-format
+msgid "%p : composer"
+msgstr "%p : kompozitor"
+
+#: src/scan.c:2386
+msgid "%r : copyright"
+msgstr "%r : autorsko pravo"
+
+#: src/scan.c:2389
+#, c-format
+msgid "%d : disc number"
+msgstr "%d : broj CD-a"
+
+#: src/scan.c:2392
+#, c-format
+msgid "%e : encoded by"
+msgstr "%e : kodirano pomoću"
+
+#: src/scan.c:2395
+#, c-format
+msgid "%g : genre"
+msgstr "%g : žanr"
+
+#: src/scan.c:2398
+#, c-format
+msgid "%i : ignored"
+msgstr "%i : ignorisano"
+
+#: src/scan.c:2401
+msgid "%l : number of tracks"
+msgstr "%l : broj numera"
+
+#: src/scan.c:2404
+#, c-format
+msgid "%o : orig. artist"
+msgstr "%o : orig. ivođač"
+
+#: src/scan.c:2407
+#, c-format
+msgid "%n : track"
+msgstr "%n : numera"
+
+#: src/scan.c:2410
+msgid "%t : title"
+msgstr "%t : naslov"
+
+#: src/scan.c:2413
+#, c-format
+msgid "%u : URL"
+msgstr "%u : URL"
+
+#: src/scan.c:2416
+msgid "%y : year"
+msgstr "%y : godina"
+
+#.
+#. * Masks Editor
+#.
+#: src/scan.c:2423
+msgid "Mask Editor"
+msgstr "Uređivač maski"
+
+#: src/scan.c:2480
+msgid "Create New Mask"
+msgstr "Napravi novu masku"
+
+#: src/scan.c:2490
+msgid "Move Up this Mask"
+msgstr "Pomeri masku nagore"
+
+#: src/scan.c:2500
+msgid "Move Down this Mask"
+msgstr "Pomeri masku nadole"
+
+#: src/scan.c:2510
+msgid "Duplicate Mask"
+msgstr "Razmnoži masku"
+
+#: src/scan.c:2520
+msgid "Add Default Masks"
+msgstr "Dodaj podrazumevanu masku"
+
+#: src/scan.c:2530
+msgid "Remove Mask"
+msgstr "Ukloni masku"
+
+#: src/scan.c:2540
+msgid "Save Masks"
+msgstr "Sačuvaj masku"
+
+#: src/scan.c:3117
+msgid "New_mask"
+msgstr "Nova _maska"
+
+#: src/scan.c:3155
+msgid "Copy: No row selected!"
+msgstr "Umnoži: Nije izabran red!"
+
+#: src/scan.c:3259
+msgid "Remove: No row selected!"
+msgstr "Ukloni: Nije izabran red!"
+
+#: src/scan.c:3306
+msgid "Move Up: No row selected!"
+msgstr "Pomeri nagore: Nije izabran red!"
+
+#: src/scan.c:3359
+msgid "Move Down: No row selected!"
+msgstr "Pomeri nadole: Nije izabran red!"
+
+#: src/setting.c:889
+#, 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:1032 src/setting.c:1069
+#, c-format
+msgid "Can't open configuration file '%s' (%s)"
+msgstr "Ne mogu da otvorim datoteku sa postavkama „%s“ (%s)"
+
+#: src/setting.c:1033
+msgid "Loading default configuration..."
+msgstr "Učitavam podrazumevane postavke..."
+
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
+#, c-format
+msgid "Can't create or open file '%s' (%s)"
+msgstr "Ne mogu da napravim ili otvorim datoteku „%s“ (%s)"
+
+#: src/setting.c:1278
+#, 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:1358
+msgid "Loading default 'Fill Tag' masks..."
+msgstr "Učitavam podrazumevane maske za „Popuni oznaku“..."
+
+#. Fall back to defaults
+#: src/setting.c:1386
+msgid "Loading default 'Rename File' masks..."
+msgstr "Učitavam podrazumevane maske za „Preimenuj datoteku“..."
+
+#. Fall back to defaults
+#: src/setting.c:1413
+msgid "Loading default 'Rename Directory' masks..."
+msgstr "Učitavam podrazumevane maske za „Preimenuj direktorijum“..."
+
+#: src/setting.c:1606
+msgid "ERROR: The environment variable HOME is not defined!"
+msgstr "Greška: Promenjljiva okruženja „HOME“ nije određena!"
+
+#: src/setting.c:1622
+#, c-format
+msgid "ERROR: Can't create directory '%s' (%s)!"
+msgstr "Greška: Ne mogu da napravim direktorijum „%s“ (%s)!"
+
+#: src/vcedit.c:287
+msgid "Input truncated or empty."
+msgstr "Ulaz je ckraćen ili prazan."
+
+#: src/vcedit.c:289
+msgid "Input is not an Ogg bitstream."
+msgstr "Ulaz nije Ogg bitski tok."
+
+#: src/vcedit.c:307
+msgid "Error reading first page of Ogg bitstream."
+msgstr "Greška pri čitanju prve strane Ogg bitskog toma."
+
+#: src/vcedit.c:313
+msgid "Error reading initial header packet."
+msgstr "Greška pri čitanju početnog paketa zaglavlja."
+
+#: src/vcedit.c:341
+msgid "Ogg bitstream contains neither speex or vorbis data."
+msgstr "Ogg bitski tok ne zadrži ni speex ni vorbis podatke."
+
+#: src/vcedit.c:375
+msgid "Corrupt secondary header."
+msgstr "Oštećeno sekundarno zaglavlje."
+
+#: src/vcedit.c:405
+msgid "Need to save extra headers - TODO!!"
+msgstr "Potrebno je da sačuvam dodatno zaglavlje - NEDOVRŠENO!"
+
+#: src/vcedit.c:419
+msgid "EOF before end of vorbis headers."
+msgstr "Kraj datoteke pre kraja vorbis zaglavlja."
+
+#: src/vcedit.c:584
+msgid "Corrupt or missing data, continuing..."
+msgstr "Oštećeni ili nepostojeći podaci, nastavljam..."
+
+#: src/vcedit.c:621
+msgid ""
+"Error writing stream to output. Output stream may be corrupted or truncated."
+msgstr ""
+"Greška pri upisu toka u izlaz. Izlazni tok je možda oštećen ili skraćen."
+
+#. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
+#: src/win32/win32dep.c:177
+#, c-format
+msgid "DLL '%s' not found. Try loading it..."
+msgstr "DLL „%s“ nije nađen. Pokušajte da ga učitate..."
+
+#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
+#: src/win32/win32dep.c:182
+#, c-format
+msgid "DLL '%s' could not be loaded"
+msgstr "DLL „%s“ ne može biti učitan"
+
+#. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
+#: src/win32/win32dep.c:193
+#, c-format
+msgid "This version of '%s' contains '%s'"
+msgstr "Ova verzija „%s“-a sadrži „%s“"
+
+#. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
+#: src/win32/win32dep.c:200
+#, c-format
+msgid "Function '%s' not found in dll '%s'"
+msgstr "Funkcija „%s“ nije nađena u dll „%s“"
+
+#. Log_Print(_("Audio player: '%s'"), player);
+#: src/win32/win32dep.c:294
+#, c-format
+msgid "Audio player: '%s'"
+msgstr "Program za reprodukciju zvuka: „%s“"
+
+#. ET_Win32_Path_Replace_Backslashes(app_data_dir);
+#. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
+#: src/win32/win32dep.c:434
+#, c-format
+msgid "EasyTAG settings dir: '%s'"
+msgstr "Direktorijum sa postavkama: „%s“"
+
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Izabrana putanja je pogrešna!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Razlikuj velika i mala lova"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Zameni karakter nekim drugim."
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Učitan sadržaj datoteke :"
+
+#~ msgid "Files Name List :"
+#~ msgstr "Lista imena datoteka:"
+
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(MP3 datoteke podržane kroz: libid3tag %s)"
+
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(ID3v2.3 oznake podržane kroz: id3lib %d.%d.%d)"
diff --git a/po/sv.gmo b/po/sv.gmo
index ac6220e..64c8f21 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 15c2089..5c381cd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 2.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
-"PO-Revision-Date: 2007-07-11 12:33+0100\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
+"PO-Revision-Date: 2007-08-21 09:48+0100\n"
 "Last-Translator: Anders Strömer <anders.stromer@comhem.se>\n"
 "Language-Team: Swedish <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Poedit-Language: Swedish\n"
 "X-Poedit-Country: SWEDEN\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
@@ -27,185 +27,222 @@ msgstr ""
 "Vorbis, MP4/AAC, MusePack och Monkey's Audio filer. Det är enkelt och har "
 "ett trevligt GTK+ gränssnitt vilket gör taggningen enklare i GNU/Linux."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(Tysk översättning)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(Rysk översättning)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(Holländsk översättning)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(Svensk översättning)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(Ungersk översättning)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(Italiensk översättning)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(Japansk översättning)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(Ukrainsk översättning)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(Tjeckisk översättning)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(Spansk översättning)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(Polsk översättning)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(Rumänsk översättning)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(Dansk översättning)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(Grekisk översättning)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Brasilien Portugisisk översättning)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(Bulgarisk översättning)"
 
-#: src/about.c:160
+#: src/about.c:171
 msgid "(Chinese translation)"
 msgstr "(Kinesisk översättning)"
 
-#: src/about.c:161
-#, fuzzy
+#: src/about.c:172
 msgid "(Hebrew translation)"
-msgstr "(Grekisk översättning)"
+msgstr "(Hebreisk översättning)"
+
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(Tysk översättning)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr "Tilläggs Namn"
+
+#: src/about.c:227
+#, fuzzy
+msgid "Status"
+msgstr "Statut"
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "Kommentar"
 
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "Om..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "Om"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(Kompilerad: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(använder: GTK+ %d.%d.%d)"
 
-#: src/about.c:283
+#: src/about.c:305
 #, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(MP3 support möjligord, använder: libid3tag %s)"
+msgid "Author: %s"
+msgstr "Upphovsman: %s"
 
-#: src/about.c:287
+#: src/about.c:309 src/easytag.c:212
 #, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(ID3v2.3 tagg support möjligord, använder: id3lib %d.%d.%d)"
+msgid "E-mail: %s"
+msgstr "E-post: %s"
 
-#: src/about.c:292
-msgid "(ID3v2.3 tags  support disabled)"
-msgstr "(Support för ID3v2.3 taggar avstängd)"
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Web-sida: "
 
-#: src/about.c:296
-#, c-format
-msgid "(MP3 file support disabled)"
-msgstr "(Support för MP3 filer är avstängd)"
+#: src/about.c:328
+msgid "Description:"
+msgstr "Beskrivning:"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
-msgstr "(Support för Ogg Vorbis filer är avstängd)"
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr "Tillägg"
 
-#: src/about.c:307
-msgid "(Speex file support disabled)"
-msgstr "(Support för Speex filer är avstängd)"
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr "libid3tag %s"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
-msgstr "(Support för FLAC filer är avstängd)"
+#: src/about.c:394
+msgid "MP3 file support"
+msgstr "Support för MP3 filer"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
-msgstr "(Support för MP4/AAC filer är avstängd)"
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr "tillgänglig"
 
-#: src/about.c:322
-msgid "(WavPack file support disabled)"
-msgstr "(Support för WavPack filer är avstängd)"
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr "avstängd"
 
-#: src/about.c:330
+#: src/about.c:404
 #, c-format
-msgid "Author: %s"
-msgstr "Upphovsman: %s"
+msgid "id3lib %d.%d.%d"
+msgstr "id3lib %d.%d.%d"
 
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-post: %s"
+#: src/about.c:408
+msgid "ID3v2.3 tags writting support"
+msgstr "för skrivning av ID3v2.3 taggar"
 
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Web-sida: "
+#: src/about.c:410
+msgid "available"
+msgstr "tillgänglig"
 
-#: src/about.c:352
-msgid "Description:"
-msgstr "Beskrivning:"
+#: src/about.c:420
+msgid "Ogg Vorbis file support"
+msgstr "Support för Ogg Vorbis filer"
+
+#: src/about.c:430
+msgid "Speex file support"
+msgstr "Support för Speex filer"
+
+#: src/about.c:440
+msgid "FLAC file support"
+msgstr "Support för FLAC filer"
+
+#: src/about.c:450
+msgid "MP4/AAC file support"
+msgstr "Support för MP4/AAC filer"
+
+#: src/about.c:460
+msgid "WavPack file support"
+msgstr "Support för WavPack filer"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "Tack"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "Översättningar:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "Allmänt:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "Ändringar"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -538,7 +575,7 @@ msgstr "Döp Om Katalogen"
 msgid "Reload Directory"
 msgstr "Ladda Om Katalogen"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "Bläddra i Kataloger med ..."
 
@@ -683,7 +720,7 @@ msgstr "Ny förinställd sökväg vald för filer"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "Bekräfta..."
 
@@ -695,86 +732,65 @@ msgstr ""
 "En del filer har ändrats men inte sparats...\n"
 "Vill du spara dessa innan byte av katalog?"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"Den inskrivna sökvägen är inte rätt!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "Fel..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 msgid "<All albums>"
 msgstr "<Alla album>"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Fel: Sökning efter %s, kunde inte finna nod %s i träd."
 
-#: src/browser.c:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "Artist"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# Album"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# Filer"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "Gå till föräldra-katalog"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "Skriv in en katalog att bläddra i."
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "Träd"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "Artist & Album"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "Byta namn på katalogen"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Byta namn på katalogen '%s' till : "
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "Använd mask :"
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 msgid "If activated, it will use masks to rename directory."
 msgstr "Om aktiv, kommer den att använda mask för att ändra namn på katalogen."
 
-#: src/browser.c:3236
+#: src/browser.c:3263
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -782,21 +798,31 @@ msgstr ""
 "Välj eller skriv in den typ av mask (se Legend i Scanner fönstret) för att "
 "namnge katalogen från taggfältet."
 
-#: src/browser.c:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "Fel Scanner Mask"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "Namnge förhandsvisning av katalog..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "Fel..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "Du måste skriva in ett katalognamn!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -825,7 +851,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -834,7 +860,7 @@ msgstr ""
 "Kunde inte ändra namnet, katalognamnet existerar redan!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -849,51 +875,51 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "Katalognamnet ändrades"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "Program att köra :"
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 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å nuvarande katalog som "
 "parameter."
 
-#: src/browser.c:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "Öppna fil med ..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 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å nuvarande fil som "
 "parameter."
 
-#: src/browser.c:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "Du måste skriva in ett programnamn!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Programmet '%s' kunde inte hittas!"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Kunde inte starta %s (fel %d)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "Kan inte starta en ny process!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Exekverat kommando : '%s %s'"
@@ -981,7 +1007,7 @@ msgstr "Sök I :"
 msgid "All Fields"
 msgstr "Alla Fält"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "Andra"
 
@@ -1056,7 +1082,7 @@ msgstr "Kategorier"
 msgid "Results :"
 msgstr "Resultat :"
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "Sök :"
 
@@ -1085,7 +1111,7 @@ msgstr "Välj bort alla rader"
 msgid "Invert lines selection"
 msgstr "Invertera rad valet"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "Välj alla raderna"
 
@@ -1110,15 +1136,15 @@ msgstr "Sätt Till :"
 msgid "All"
 msgstr "Alla"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "FilNamn"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "Titel"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "År"
 
@@ -1130,12 +1156,12 @@ msgstr "Spår #"
 msgid "# Tracks"
 msgstr "# Spår"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "Genre"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr "Kör nuvarande scanner för varje fil"
 
@@ -1147,7 +1173,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1166,87 +1192,87 @@ msgstr ""
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Ladda dom valda raderna eller alla rader (om ingen rad är vald)."
 
-#: src/cddb.c:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "Redo att söka..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, 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:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "Invertera urvalet"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "Sortera efter Spårnummer"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "Sortera efter Spårnamn"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Kopplar upp mot värd '%s' ..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Kunde inte koppla upp mot värd '%s' (%s)!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, 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:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Kopplar upp mot värd '%s', på port '%d' ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Kan inte kontakta värd '%s' (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Uppkopplad mot värd '%s'"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Emottager data (%s) ..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Fel vid läsning av cddb svar (%s)!"
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Kan inte skapa fil '%s' (%s)"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Kan inte öppna fil '%s' (%s)"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "Skickar förfrågan ..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Kan inte skicka förfrågan (%s)!"
@@ -1255,62 +1281,62 @@ msgstr "Kan inte skicka förfrågan (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "Emottager data ..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 msgid "The server returned a wrong answer!"
 msgstr "Servern returnerade ett fel svar!"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Servern returnerade ett fel svar! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 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:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Hittade %d matchande album"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Emottager data för sidan %d (album %d/%d)..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Emottager data för sidan %d ..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr "Flera resultat att ladda ..."
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 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:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d fil(er) vald(a)!"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 msgid "Local CD search..."
 msgstr "Lokal CD sökning..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
@@ -1319,27 +1345,27 @@ msgstr ""
 "Skriv in sökvägen i preferens fönstret"
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Skickar förfrågan (CddbId: %s, #spår: %d, Disk längd: %d) ..."
 
-#: src/cddb.c:3231
+#: src/cddb.c:3268
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Hittade %d matchande album för DiskID '%s'"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, 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:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "Laddar albumets spår lista ..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1352,7 +1378,7 @@ msgstr ""
 "\n"
 "Vill du fortsätta ?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "Skriv taggen från CDDB..."
 
@@ -1625,11 +1651,11 @@ msgstr "Fil Länken är Bruten"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Lager ?"
 
@@ -1637,7 +1663,7 @@ msgstr "?, Lager ?"
 msgid "Bitrate:"
 msgstr "Bitvärde:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1645,17 +1671,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Frekvens:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Typ:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1836,13 +1862,13 @@ msgid "Tag selected files with these pictures"
 msgstr "Tagga valda filer med dessa bilder"
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
-msgstr "Ta bort valda bilder, annars alla bilder."
-
-#: src/easytag.c:1051
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Lägga till bilder till taggen (drag och släpp är också tillgängligt)."
 
+#: src/easytag.c:1051
+msgid "Remove selected pictures, else all pictures."
+msgstr "Ta bort valda bilder, annars alla bilder."
+
 #: src/easytag.c:1061
 msgid "Save the selected pictures on the hard disk."
 msgstr "Spara de valda bilderna till hårddisken."
@@ -2214,7 +2240,7 @@ msgstr "Radera Fil..."
 msgid "File '%s' deleted"
 msgstr "Fil '%s' raderad"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2226,109 +2252,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "Sökning pågår..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "Fil: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, 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:3235
+#: src/easytag.c:3239
 #, 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:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u fil(er)"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr "Hittade ingen fil i denna katalog och underkataloger!"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "Ingen fil hittades i denna katalog!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "Söker..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "  STOPPA sökningen...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "Välj en katalog att bläddra i!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr "Tagga valda filer med detta fält"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Konvertera '_' och '%20' till mellanslag"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "Konvertera ' ' till '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "Enbart versaler"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "Enbart gemener"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "Första bokstaven versal"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "Första bokstaven versal i alla orden"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "Avlägsna mellanslag"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "Lägg in mellanslag före varje versal"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 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:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Onormal avstängning! (PId: %d)."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, c-format
-msgid "Received signal %s (%d)"
-msgstr "Mottog signal %s (%d)"
+msgid "Received signal %s (%d)\a"
+msgstr "Mottog signal %s (%d)\a"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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 "
@@ -2338,11 +2364,12 @@ msgstr ""
 "med en gdb bakåtspårning ('gdb easytag core' sedan 'bt' och 'l') och "
 "information om hur man kan upprepa detta till easytag@gmail.com"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "Okänd signal"
 
-#: src/easytag.c:4466
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2355,8 +2382,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2376,11 +2402,11 @@ msgstr ""
 "Sökväg_till/filer     Använd en relativ sökväg.\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Avslutades Normalt."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2388,7 +2414,7 @@ msgstr ""
 "Vissa filer har modifierats men inte sparats...\n"
 "Vill du spara dessa filer innan du avslutar programmet?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr "Vill du avsluta programmet?"
 
@@ -2484,7 +2510,7 @@ msgstr ""
 "till systemets filnamns kodning\n"
 "(Försök att ställa in miljövariabel G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr "Översättning filnamn"
 
@@ -2654,122 +2680,122 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "Trasig fil..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr "Logg"
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr "OK"
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr "Ja"
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr "Nej"
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr "Utför"
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr "Spara"
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr "Avbryt"
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr "Stäng"
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr "Skriv"
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr "Kör"
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr "Sök"
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr "Bläddra..."
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "Välj katalog..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "Välj fil..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "Warning..."
 msgstr "Varning..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr "Ingen ljud-spelare har definierats"
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, 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:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "Generera en spel-lista"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "M3U Spel-lista Namn"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "Använd katalogens namn"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "Editera Maskar"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "Spel-lista valmöjligheter"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "Inkludera enbart de valda filerna"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2777,52 +2803,52 @@ msgstr ""
 "Om aktiverad kommer enbart dom valda filerna att skrivas till spel-listans "
 "fil. Annars skrivs samtliga filer till spel-listans fil."
 
-#: src/misc.c:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "Använd fullständig sökväg för filerna i spel-listan"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 msgid "Use relative path for files in playlist"
 msgstr "Använd relativ sökväg för filerna i spel-listan"
 
 #. Create playlist in parent directory
-#: src/misc.c:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "Skapa en spel-lista i föräldra katalogen"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Om aktiverad kommer en spel-lista att skapas i föräldra katalogen"
 
 #. DOS Separator
-#: src/misc.c:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "Använd DOS-katalogs separering"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 "denna möjlighet byter UNIX katalog separation '/' till DOS separerare '\\'."
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "Spel-lista Innehåll"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "Skriv enbart en lista över filerna"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "Använd filnamnet för att skriva info"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "Skriva info användandes :"
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2831,12 +2857,12 @@ msgstr ""
 "Spel-listan '%s' existerar redan!\n"
 "Skriva över?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "Skriva Spel-lista..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2845,48 +2871,44 @@ msgstr ""
 "Kan inte skriva spel-listan '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Skrev Spel-lista '%s'"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "Spår"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "Kommentar"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "Kompositör"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "Orig. Artist"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr "URL"
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "Kodad av"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "Sök efter fil"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2894,54 +2916,93 @@ msgstr ""
 "att visa alla filer."
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "I :"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "Taggen"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Teckenkänsligt"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Hittade : %d fil(er)"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "Ladda filnamn från en TXT fil"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 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:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " Ladda"
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "Laddade Fil Innehåll :"
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "Bekräfta namnbyte av fil"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "FilNamns-Lista :"
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "Lägg till ett mellanslag före en stor bokstav"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "Radera denna rad"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "Radera samtliga blanka rader"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "Inkludera enbart de valda filerna"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "Inkludera enbart de valda filerna"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "Ladda om"
 
-#: src/misc.c:2828
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "Skriv enbart en lista över filerna"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "Välj alla raderna"
+
+#: src/misc.c:3016
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2949,21 +3010,23 @@ msgstr ""
 "När denna möjlighet aktiveras, efter att filnamn laddats kommer den valda "
 "scannern att köras (scanner fönstret måste vara öppnat)."
 
-#: src/misc.c:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "Lägg till en blank rad"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "Radera denna rad"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "Radera samtliga blanka rader"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "Flytta Upp denna Mask"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "Ladda om"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "Flytta Ned denna Mask"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3102,111 +3165,111 @@ msgstr ""
 msgid "Save file..."
 msgstr "Spara fil..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "JPEG bild"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "PNG bild"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "Okänd bild"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 pixel PNG fils ikon"
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr "Annan fil ikon"
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr "Konvolut (framsida)"
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr "Konvolut (baksida)"
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr "Ströskrifts sida"
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr "Media (e.g. etikettsida av CD)"
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr "Lead artist/lead performer/solist"
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "Artist/performer"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "Band/Orkester"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr "Lyrik/text författare"
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr "Plats för inspelning"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr "Under inspelning"
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr "Under framträdande"
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr "Film/video upptagning"
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr "En ljust färgad fisk"
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr "Illustration"
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr "Band/Artist-logotyp"
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr "Utgivare/studio-logotyp"
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr "Okänd bildtyp"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "pixtlar"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "Typ"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3214,11 +3277,11 @@ msgstr ""
 "Kan inte visa bilden då inte tillräckligt med data har lästs in för att "
 "kunna avgöra hur bild bufferten skall skapas."
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "Laddar bildfil..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3229,7 +3292,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr "Bildfilen är inte laddad..."
 
@@ -3264,15 +3327,14 @@ msgstr ""
 "Vid uppstart, ladda förinställd katalog eller katalog given som argument"
 
 #: src/prefs.c:203
-#, fuzzy
 msgid ""
 "Automatically search files, when EasyTAG starts, into the default directory. "
 "Note that this path may be overriden by the parameter passed to easytag "
 "(easytag /path_to/mp3_files)."
 msgstr ""
-"Sök automatiskt efter filer i denna katalog när EasyTAG startas. Notera att "
-"denna sökväg kan komma att skrivas över av dom parametrar som ges till "
-"easytag (easytag /sökväg_till/mp3_filer)."
+"Automatiskt sökning efter filer, när EasyTAG startas, sök i denna katalog. "
+"Notera att den här sökvägen kan komma att skrivas över av den parametrar som "
+"ges till easytag (easytag /sökväg_till/mp3_filer)."
 
 #. Browse subdirectories
 #: src/prefs.c:208
@@ -3285,9 +3347,8 @@ msgstr "Sök i underkataloger efter filer och läs in dom i trädstrukturen."
 
 #. Open the node to show subdirectories
 #: src/prefs.c:215
-#, fuzzy
 msgid "Show subdirectories when selecting a directory"
-msgstr "Visa underkataloger vid val av katalog"
+msgstr "Visa underkataloger när en katalog valts"
 
 #: src/prefs.c:219
 msgid ""
@@ -3483,23 +3544,50 @@ msgstr ""
 "ljudfiler. En del argument kan användas (ex 'xmms -p') i förväg för att ta "
 "emot filer som andra argument."
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "Tagg Möjligheter"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "I centrum av huvudfönstret"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr "Om aktiverad kommer en spel-lista att skapas i föräldra katalogen"
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "Fil-Inställningar"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "Fil-Möjligheter"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr "Byt ut illegala tecken i filnamn (för Windows och CD-rom)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3512,46 +3600,46 @@ msgstr ""
 "taggarna med hjälp av scannern."
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "Konvertera filändelser till :"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "Gemener"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr "Exempelvis kommer ändelsen att konvertera till '.mp3'"
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "Versaler"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr "Exempelvis kommer ändelsen att konvertera till '.MP3'"
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "Ändra Inte"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr "Ändelsen kommer inte att konverteras"
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr "Bevara ändringstiden på filen"
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr "Bevarar tiden för filens ändring (i fil-egenskaperna) när den sparas."
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
@@ -3559,7 +3647,7 @@ msgstr ""
 "Uppdatera modifierings tiden för föräldra-katalogen till filen "
 "(rekommenderas när Amarok används"
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3575,12 +3663,12 @@ msgstr ""
 "av föräldra-katalogen"
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr "Tecken-Uppsättning för Filnamn"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
@@ -3588,11 +3676,11 @@ msgstr ""
 "Regler att applicera om tecken inte kan konverteras till systemets "
 "teckenkodning vid skrivning av filnamn."
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "Pröva en annan teckenkodning"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
@@ -3603,13 +3691,13 @@ msgstr ""
 "'fr', KOI8-R för 'ru', ISO-8859-2 för 'ro'). om detta inte lyckas, kommer "
 "programmet att försöka med tecken kodningen ISO-8859-1."
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 "Tvinga fram användande av systemets teckenkodning och aktivera översättningen"
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3619,7 +3707,7 @@ msgstr ""
 "teckensnittstabellen så kan den eventuellt representeras av en eller flera "
 "liknande tecken."
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
@@ -3627,7 +3715,7 @@ msgstr ""
 "Tvinga fram användande av systemets teckenkodning och avlägsna somliga "
 "tecken i tysthet"
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3638,20 +3726,20 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "Tagg Inställningar"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "Tagg Möjligheter"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "Om ej komplett, fyll i datum automatiskt"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3661,11 +3749,11 @@ msgstr ""
 "årtalet (exempelvis, om valt år är 2005: 5 => 2005, 4 => 2004, 6 => 1996, 95 "
 "=> 1995, ...)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "Fyll i spårfältet med följande siffror :"
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
@@ -3675,11 +3763,11 @@ msgstr ""
 "nummer, för att använda en nummerserie med 'n' antal siffror (Ex. med två "
 "siffror : '05', '09', '10',...). I annat fall bevaras det 'råa' spårvärdet."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "Ogg Vorbis Filer : Skriv även kommentarer för XMMS formatet"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3693,7 +3781,7 @@ msgstr ""
 "inte vill att andra applikationer ska klaga på ett okänt fält. Kommentarerna "
 "kommer ändå inte att visas i XMMS."
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
@@ -3701,11 +3789,11 @@ msgstr ""
 "Sätt fokus på taggfältet när byte sker mellan filer med kortkommandona Sida "
 "Upp/Sida Ned:"
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr "Bevarar fokus för samma tagg-fält"
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr "Sätt åter fokus på första tagg-fältet ('Titel'-fältet)"
 
@@ -3713,21 +3801,21 @@ msgstr "Sätt åter fokus på första tagg-fältet ('Titel'-fältet)"
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
 msgstr "Inställningar för ID3 Taggar"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "Regler för ID3 Taggar"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr "Skriv ID3 taggar i FLAC filer (i samklang med FLAC tagg)"
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
@@ -3737,11 +3825,11 @@ msgstr ""
 "tas bort."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "Ta bort taggen om alla fält är tomma"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3754,11 +3842,11 @@ msgstr ""
 "sju standardfält har tömts."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "Konvertera automatiskt äldre ID3v2 tagg versioner"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3767,39 +3855,39 @@ msgstr ""
 "uppdateras till ID3v2.3 versionen."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr "Använd CRC32"
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "Ställ in CRC32 i ID3v2 taggarna"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr "Använd Komprimering"
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr "Ställ in Komprimering i ID3v2 taggarna"
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 msgid "Character Set for writing ID3 tags"
 msgstr "Ställ in teckenkodningen för skrivning av ID3 taggar"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 msgid "ID3v2 tags"
 msgstr "ID3v2 taggar"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "Skriv ID3v2 tagg"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -3808,11 +3896,11 @@ msgstr ""
 "början av MP3 filerna. I annat fall kommer den att tas bort."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 msgid "Version:"
 msgstr "Version:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3824,52 +3912,52 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr "Teckenkod"
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 msgid "Unicode "
 msgstr "Unicode "
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 msgid "Unicode type to use"
 msgstr "Typ av Unicode att använda"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 msgid "Character set used to write the tag data in the file."
 msgstr "Teckenuppsättning att använda för att skriva in data i filens tagg."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr "Nuvarande inställning för iconv():"
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 msgid "No"
 msgstr "Nej"
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr "//IGNORERA"
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 msgid "ID3v1 tags"
 msgstr "ID3v1 taggar"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "Skriv ID3v1.x taggen"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3877,21 +3965,21 @@ msgstr ""
 "Om aktiverad kommer en ID3v1 tagg att läggas till eller uppdateras i slutet "
 "av MP3 filen. I annat fall kommer den att tas bort."
 
-#: src/prefs.c:846
+#: src/prefs.c:878
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
 "Teckenuppsättning att använda för att skriva in ID3v1 tagg-data i filen."
 
 #. Character Set for reading tag
-#: src/prefs.c:878
+#: src/prefs.c:910
 msgid "Character Set for reading ID3 tags"
 msgstr "Teckenuppsättning för ID3 taggar"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr "Ej standard:"
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3922,31 +4010,31 @@ msgstr ""
 "teckensnittskodningen '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:914
+#: src/prefs.c:947
 msgid "Character set used to read tag data in the file."
 msgstr "Teckenuppsättning att använda för att läsa data i filens tagg."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Fyll Tagg Scanner - Tecken Konvertering"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Konvertera nedsänkta streck '_' och '%20' strängar till mellanslag ' '"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Konvertera mellanslag ' ' till nedsänkta streck '_'"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -3955,11 +4043,11 @@ msgstr ""
 "mask från scannern av taggar."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Döpa om Filer Scanner - Tecken Konvertering"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -3968,19 +4056,19 @@ msgstr ""
 "scanner till filnamnen."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:994
+#: src/prefs.c:1027
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Bearbeta Fält Scanner - Tecken konvertering"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1001
+#: src/prefs.c:1034
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 "Gör inte om begynnelsebokstaven till versal i ord för prepositioner och "
 "artiklar."
 
-#: src/prefs.c:1005
+#: src/prefs.c:1038
 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 "
@@ -3993,15 +4081,15 @@ msgstr ""
 "inledande text' istället för 'En Inledande Text')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "Scanner-Fönster"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "Öppna Scanner-Fönstret vid start"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4009,11 +4097,11 @@ msgstr ""
 "Aktivera denna möjlighet för att automatiskt öppna scanner-fönstret vid "
 "start av EasyTAG."
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "Scanner-fönstret alltid överst"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4022,16 +4110,16 @@ msgstr ""
 "ovan på huvud fönstret."
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "Fält"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "Skriv över fälten när taggar scannas"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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."
@@ -4040,11 +4128,11 @@ msgstr ""
 "nya texten. Om avaktiverad så fylls enbart de blanka fälten i taggen med ny "
 "text."
 
-#: src/prefs.c:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "Använd denna text som förvald kommentar :"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4053,11 +4141,11 @@ msgstr ""
 "fältet vid användning av 'Fyll Tagg' scannern."
 
 #. CRC32 comment
-#: src/prefs.c:1072
+#: src/prefs.c:1105
 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:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4068,42 +4156,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "CD Data Bas"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 msgid "Server Settings for Automatic Search"
 msgstr "Server Inställningar för Automatisk Sökning"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "Namn :"
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "CGI Sökväg :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 msgid "Server Settings for Manual Search"
 msgstr "Server Inställningar för Manuell Sökning"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 msgid "Local CD Data Base"
 msgstr "Lokal CD DataBas"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 msgid "Path :"
 msgstr "Sökväg :"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4116,52 +4204,52 @@ msgstr ""
 "'diverse'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "Proxy Inställningar"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "Använd en proxy"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "Aktivera inställningarna för proxy servern."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "Värd Namn :"
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "Namnge proxy servern."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "Port att använda för proxy servern."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "Användar Namn :"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "Namn på användare för proxy servern."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "Användarens Lösenord :"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr "Användar-lösenord för proxy servern."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "Spår Namn Lista"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4169,7 +4257,7 @@ msgstr ""
 "Välj motsvarande ljudfil (I enlighet med positionen eller DLM om aktiverad "
 "nedan)"
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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."
@@ -4178,7 +4266,7 @@ msgstr ""
 "av ljudfilen i huvud-listan."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4189,15 +4277,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Bekräfta"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "Bekräfta avslut av program"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4205,53 +4293,57 @@ msgstr ""
 "Om aktiverat kommer en dialog att öppnas med förfrågan efter bekräftelse "
 "före avslut av program."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "Bekräfta skrivning av fil-tagg"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "Bekräfta namnbyte av fil"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "Bekräfta raderande av fil"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "Bekräfta skrivning av spellista"
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Applicera ändringarna (men spara inte) och stäng denna dialog"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "Stäng detta fönster utan att spara"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 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:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Exempel : %.*d_-_Spår_namn_1.mp3)"
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "Ändringarna har applicerats"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "Konfigurationen sparad"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "Konfigurationen oförändrad"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4262,11 +4354,11 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "Inte en katalog"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Ljud-spelaren '%s' kan inte hittas!"
@@ -4283,37 +4375,37 @@ msgstr "Byt Namn på Fil och Katalog"
 msgid "Process Fields"
 msgstr "Bearbeta Fält"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "Taggar framgångsrikt scannade..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Taggar framgångsrikt scannade...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 "Tagg scanner: mystiskt..., ändelsen '%s' kunde inte hittas i filnamnet '%s'!"
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Sök Fel: kan inte finna separator '%s' inom '%s'"
 
-#: src/scan.c:660
+#: src/scan.c:663
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Kunde inte konvertera filnamnet '%s' till systemets filnamns kodning."
 
-#: src/scan.c:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "Nytt filnamn framgångsrikt scannat..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nytt filnamn framgångsrikt scannat...(%s)"
@@ -4321,41 +4413,41 @@ msgstr "Nytt filnamn framgångsrikt scannat...(%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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "Tagg och Filnamns scanner"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "Scanner:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "Välj typ av scanner att använda"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "Öppna scanner fönstret / Scanna valda filer"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "Scanner Val"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "Visa / Dölj Mask-Editorn"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "Visa / Dölj Legend"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "Stäng detta fönster"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4364,15 +4456,15 @@ msgstr ""
 "filnamn och sökväg med. Används för att fylla i tagg fält."
 
 #. Preview label
-#: src/scan.c:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "Förhandsvisning av fil-tagg..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr "Förinställ mask till nuvarande sökväg"
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4385,15 +4477,15 @@ msgstr ""
 "en absolut sökväg, i annat fall är den relativ till den gamla sökvägen."
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "Förhandsvisning av filer med ändrade namn..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "Välj fält:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4402,126 +4494,126 @@ msgstr ""
 "intresserar dej."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "Bearbeta filnamns-fält"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "Bearbeta titel-fält"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "Bearbeta filens artist-fält"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "Bearbeta album-fält"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "Bearbeta genre-fält"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "Ko"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "Bearbeta kommentar-fält"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "K"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "Bearbeta kompositör-fält"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 msgid "Process original artist field"
 msgstr "Bearbeta original artist-fält"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Co"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "Bearbeta copyright-fält"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "Bearbeta URL-fält"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "A"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "Bearbeta avkodar namn-fält"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "Invertera Valen"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "Välj/Välj bort Alla."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Konvertera '_' och '%20' till ' '"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 msgid "Convert:"
 msgstr "Konvertera:"
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 msgid "to: "
 msgstr "till: "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4529,7 +4621,7 @@ msgstr ""
 "Det nedsänkta strecket eller strängen '%20' byts ut mot ett mellanslag. "
 "Exempelvis, före: 'En%20Inledande_Text', Efter: 'En Inledande Text'."
 
-#: src/scan.c:2169
+#: src/scan.c:2284
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4537,11 +4629,12 @@ msgstr ""
 "Mellanslag byts ut mot ett nedsänkt streck. Exempelvis, före:  'En Inledande "
 "Text', Efter: 'En%20Inledande_Text'."
 
-#: src/scan.c:2171
-msgid "Replace a character by an other one."
-msgstr "Byt ut ett tecken mot ett annat."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4549,7 +4642,7 @@ msgstr ""
 "Konvertera alla ord i ett fält till versaler. Exempel, före: 'En INLEDANDE "
 "text', efter: 'EN INLEDANDE TEXT'."
 
-#: src/scan.c:2206
+#: src/scan.c:2322
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4557,7 +4650,7 @@ msgstr ""
 "Konvertera alla ord i ett fält till gemener. Exempel, före: 'En INLEDANDE "
 "text', efter: 'en inledande text'."
 
-#: src/scan.c:2209
+#: src/scan.c:2325
 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'."
@@ -4565,7 +4658,7 @@ msgstr ""
 "Konvertera begynnelse bokstaven i det första ordet i ett fält till en "
 "versal. Exempel, före: 'En INLEDANDE text', efter: 'En inledande text'."
 
-#: src/scan.c:2212
+#: src/scan.c:2328
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4573,15 +4666,15 @@ msgstr ""
 "Konvertera alla initialer till en versal i ett fält. Exempel, före: 'En "
 "INLEDANDE text', efter: 'En Inledande Text'."
 
-#: src/scan.c:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "Lägg till ett mellanslag före en stor bokstav"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "Ta bort upprepningar av mellanslag eller nedsänkta streck"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4589,7 +4682,7 @@ msgstr ""
 "Alla mellanslag tas bort. Exempel, före: 'En Inledande Text', efter: "
 "'EnInledandeText'."
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4597,7 +4690,7 @@ msgstr ""
 "Ett mellanslag sätts in mellan varje versal. Exempel, före: "
 "'EnInledandeText', efter: 'En Inledande Text'."
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4608,183 +4701,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "Legend"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artist"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : kommentar"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p : kompositör"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r : copyright"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : skiv-nummer"
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : kodad av"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genre"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorerad"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : antal spår"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : orig. artist"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : spår"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : titel"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : år"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "Mask Editor"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "Skapa en Ny Mask"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "Flytta Upp denna Mask"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "Flytta Ned denna Mask"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "Kopiera Mask"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "Lägga till Förvald Mask"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "Ta bort Mask"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "Spara Mask"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "Ny_mask"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "Kopiering: Ingen rad vald!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "Ta bort: Ingen rad vald!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "Flytta Upp: Ingen rad vald!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "Flytta Ned: Ingen rad vald!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "FEL: Kan inte skriva konfigurations fil: %s (%s)"
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Kan inte öppna konfigurations fil %s (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "Laddar förinställd konfiguration..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Kan inte skapa eller öppna fil '%s' (%s)"
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, 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:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Laddar default 'Fyll Tagg' mask..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "Laddar default 'Ändra Namn på Fil'-mask..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Laddar default 'Ändra Namn på Katalog'-mask..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "FEL: Miljövariabeln HOME har inte definierats!"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "FEL: Kan inte skapa katalog '%s' (%s)!"
@@ -4869,9 +4962,36 @@ msgstr "Ljud Spelare: '%s'"
 msgid "EasyTAG settings dir: '%s'"
 msgstr "EasyTAG inställnings katalog: '%s'"
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Den inskrivna sökvägen är inte rätt!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
 #, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "Teckenkänsligt"
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "Byt ut ett tecken mot ett annat."
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "Laddade Fil Innehåll :"
+
+#~ msgid "Files Name List :"
+#~ msgstr "FilNamns-Lista :"
+
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(MP3 support möjligord, använder: libid3tag %s)"
+
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(ID3v2.3 tagg support möjligord, använder: id3lib %d.%d.%d)"
+
 #~ msgid "ID3V2 tag Version"
-#~ msgstr "Inkorrekt tagg version"
+#~ msgstr "ID3V2 tagg version"
 
 #~ msgid "Unicode (UTF-7)"
 #~ msgstr "Unicode (UTF-7)"
@@ -4970,7 +5090,7 @@ msgstr "EasyTAG inställnings katalog: '%s'"
 
 #~ msgid "Use non standard character set for writing ID3 tags: "
 #~ msgstr ""
-#~ "Använd en icke standard teckenuppsättning för att skriva ID3 taggar:"
+#~ "Använd en icke standard teckenuppsättning för att skriva ID3 taggar: "
 
 #~ msgid ""
 #~ "This character set will be used when writing the tag data, to convert "
@@ -5007,11 +5127,8 @@ msgstr "EasyTAG inställnings katalog: '%s'"
 #~ "Översättning av teckensnittskoden från '%s'\n"
 #~ "till '%s' understöds inte!"
 
-#, fuzzy
-#~ msgid "ERROR while opening file: '%s' (%s)"
-#~ msgstr ""
-#~ "FEL vid försök att öppna fil: '%s' (%s).\n"
-#~ ""
+#~ msgid "ERROR while opening file: '%s' (%s)\a"
+#~ msgstr "FEL vid försök att öppna fil: '%s' (%s)\a"
 
 #~ msgid "Load on startup the directory"
 #~ msgstr "Ladda denna katalog vid start"
diff --git a/po/uk.gmo b/po/uk.gmo
index 82bfbcd..c848ddc 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index b2a6717..2bd944b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTag 0.28.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2003-09-12 12:02+0300\n"
 "Last-Translator: Cawko Xakep <xakep@snark.ukma.kiev.ua>\n"
 "Language-Team: Ukrainian <linux@linux.org.ua>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "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:122
+#: src/about.c:134
 #, fuzzy
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
@@ -28,195 +28,236 @@ msgstr ""
 "MP2, FLAC, Ogg Vorbis, MusePack �� Monkey's Audio. ������� �� ��ɤ���� "
 "��������� GTK+ �������� ������� ������ ��Ǧ�."
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(�������� �������)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(�������� ��Ӧ������)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(�������� ��������)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(�������� ���̦������)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr "(�������� �����������)"
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(�������� �������)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(�������� ����������)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(�������� ����������)"
 
-#: src/about.c:156
+#: src/about.c:167
 #, fuzzy
 msgid "(Danish translation)"
 msgstr "(�������� ����������)"
 
-#: src/about.c:157
+#: src/about.c:168
 #, fuzzy
 msgid "(Greek translation)"
 msgstr "(�������� �������)"
 
-#: src/about.c:158
+#: src/about.c:169
 #, fuzzy
 msgid "(Brazilian Portuguese translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:159
+#: src/about.c:170
 #, fuzzy
 msgid "(Bulgarian translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:160
+#: src/about.c:171
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:161
+#: src/about.c:172
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(�������� �������)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(�������� �������)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "��������"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "���..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "���"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(ڦ�����: %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(������������: gtk+ %d.%d.%d �� id3lib %d.%d.%d)"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(������� OGG ��������)"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "�����: %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(������� OGG ��������)"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "E-mail: %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "������� ���Ҧ���: "
 
-#: src/about.c:292
+#: src/about.c:328
+msgid "Description:"
+msgstr "��������������:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
+
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "(������� OGG ��������)"
 
-#: src/about.c:296
-#, fuzzy, c-format
-msgid "(MP3 file support disabled)"
-msgstr "(������� OGG ��������)"
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+#, fuzzy
+msgid "enabled"
+msgstr "����������"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
-msgstr "(������� OGG ��������)"
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
+#, c-format
+msgid "id3lib %d.%d.%d"
+msgstr ""
 
-#: src/about.c:307
+#: src/about.c:408
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "ID3v2.3 tags writting support"
 msgstr "(������� OGG ��������)"
 
-#: src/about.c:312
+#: src/about.c:410
 #, fuzzy
-msgid "(FLAC file support disabled)"
-msgstr "(������� OGG ��������)"
+msgid "available"
+msgstr "����������� ���'�Ԧ"
 
-#: src/about.c:317
+#: src/about.c:420
 #, fuzzy
-msgid "(MP4/AAC file support disabled)"
+msgid "Ogg Vorbis file support"
 msgstr "(������� OGG ��������)"
 
-#: src/about.c:322
+#: src/about.c:430
 #, fuzzy
-msgid "(WavPack file support disabled)"
+msgid "Speex file support"
 msgstr "(������� OGG ��������)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "�����: %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-mail: %s"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
+msgstr "(������� OGG ��������)"
 
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "������� ���Ҧ���: "
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
+msgstr "(������� OGG ��������)"
 
-#: src/about.c:352
-msgid "Description:"
-msgstr "��������������:"
+#: src/about.c:460
+#, fuzzy
+msgid "WavPack file support"
+msgstr "(������� OGG ��������)"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "������"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "���������:\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "������Φ:\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "�ͦ��"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -618,7 +659,7 @@ msgstr "������������� �������..."
 msgid "Reload Directory"
 msgstr "���������� �������"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "����������� �� ���������..."
 
@@ -788,7 +829,7 @@ msgstr "������� ����� ������� ����"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "������������..."
 
@@ -800,112 +841,101 @@ msgstr ""
 "���˦ ����� �ͦ����, ��� �� ��������...\n"
 "�� � ��Ԧ�� �������� �ͦ�� ����� ������� � ��������?"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"������ �Ŧ������� ����!:\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "�������..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 #, fuzzy
 msgid "<All albums>"
 msgstr "������"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
 
-#: src/browser.c:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "����������"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 #, fuzzy
 msgid "# Albums"
 msgstr "������"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 #, fuzzy
 msgid "# Files"
 msgstr "����"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "������"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 #, fuzzy
 msgid "Go to parent directory"
 msgstr "������� � ������ �������"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "������� ������� ��� ���������."
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr ""
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 #, fuzzy
 msgid "Artist & Album"
 msgstr "���������� / ������"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "�������������� ��������"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "������������� ������� '%s' ��: "
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "�� ������: "
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 
-#: src/browser.c:3236
+#: src/browser.c:3263
 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:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "���������� ����� ��� �������"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 #, fuzzy
 msgid "Rename directory preview..."
 msgstr "�������� ������: �������������� �����..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "�������..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "�̦� ������ ��'� ��������!"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -932,7 +962,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -941,7 +971,7 @@ msgstr ""
 "�� ���� �������������, ��˦���� ����� ������� ��� �!\n"
 "(%s)"
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -956,47 +986,47 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "������� �������������"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "�������� ��������: "
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr "���Ħ�� ��'� ��������. �������� ������� ���� �� ����������."
 
-#: src/browser.c:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "�������� �� ���������..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr "���Ħ�� ��'� ��������. �������� ���� ���� �� ����������."
 
-#: src/browser.c:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "�̦� ������ ��'� ��������!"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, fuzzy, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "���������� �������� %s (%s)!\n"
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr "�� ���� ������ ����� ������!\n"
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "�������� �������: '%s %s'"
@@ -1083,7 +1113,7 @@ msgstr "�� ������: "
 msgid "All Fields"
 msgstr "�Ӧ ����"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "����"
 
@@ -1158,7 +1188,7 @@ msgstr " ������Ҧ� "
 msgid "Results :"
 msgstr "����������: "
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "�����:"
 
@@ -1187,7 +1217,7 @@ msgstr "��������� ��¦���"
 msgid "Invert lines selection"
 msgstr "����������� ��¦���"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "������� �Ӧ �����"
 
@@ -1209,15 +1239,15 @@ msgstr "��������� ��:"
 msgid "All"
 msgstr "�Ӧ"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "��'� �����"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "���������"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "��"
 
@@ -1229,12 +1259,12 @@ msgstr "���� N"
 msgid "# Tracks"
 msgstr "���˦�"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "�����"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr ""
 
@@ -1246,7 +1276,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1259,11 +1289,11 @@ msgstr ""
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 
-#: src/cddb.c:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "������� �� ������..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1271,78 +1301,78 @@ msgstr ""
 "������: '%s', ����������: '%s', �������: '%s', Ҧ�: '%s', ����: '%s', ID: '%"
 "s'"
 
-#: src/cddb.c:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "����������� ��¦���"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 #, fuzzy
 msgid "Sort by Track Number"
 msgstr "��������� �� ���������� ������ �����"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 #, fuzzy
 msgid "Sort by Track Name"
 msgstr "����� �����"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "���������� ���Φ ����� '%s'..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "�� ���� ��������� ��'� ����� '%s' (%s)!"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "�� ���� �������� ����� ����� (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "��'������� � '%s', ���� '%d'..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "�� ���� �'�������� �� '%s' (%s)!"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "��'������ �� '%s'"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "��������� ����� (%s)..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "������� ��������� ���� ID3v1 � '%s' (%s)."
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "�� ���� צ������ ���� '%s' (%s)"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "�� ���� צ������ ���� '%s' (%s)"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "���������� ������..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "�� ���� ��Ħ����� ����� (%s)!"
@@ -1351,92 +1381,92 @@ msgstr "�� ���� ��Ħ����� ����� (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "��������� �����..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "����������� צ���צ�� �������! (%s)"
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "����������� צ���צ�� �������! (%s)"
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr ""
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "�������� %d �������(��)"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "��������� ����� (%s)..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "��������� ����� (%s)..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 #, 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, fuzzy, c-format
 msgid "%d file(s) selected!"
 msgstr "%u ����(��)"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 #, fuzzy
 msgid "Local CD search..."
 msgstr "������� �� ������..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr ""
 
-#: src/cddb.c:3231
+#: src/cddb.c:3268
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "�������� %d �������(��)"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "�� ���� צ������ ���� '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "������������ ������ ���˦� �������..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, fuzzy, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1448,7 +1478,7 @@ msgstr ""
 "\n"
 "����������?"
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "����� ���� �� ������ CDDB..."
 
@@ -1721,11 +1751,11 @@ msgstr "���� ������� ���������"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
@@ -1733,7 +1763,7 @@ msgstr "?, Layer ?"
 msgid "Bitrate:"
 msgstr "������:"
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr "? ��/�"
 
@@ -1741,17 +1771,17 @@ msgstr "? ��/�"
 msgid "Freq:"
 msgstr "�������:"
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr "? ��"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "���:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr "?"
 
@@ -1948,14 +1978,14 @@ msgid "Tag selected files with these pictures"
 msgstr "������������ �Ӧ ����� ����� ����������"
 
 #: src/easytag.c:1045
+msgid "Add pictures to the tag (drag and drop is also available)."
+msgstr ""
+
+#: src/easytag.c:1051
 #, fuzzy
 msgid "Remove selected pictures, else all pictures."
 msgstr "�������� ��� � ��Ħ����� ���̦�"
 
-#: src/easytag.c:1051
-msgid "Add pictures to the tag (drag and drop is also available)."
-msgstr ""
-
 #: src/easytag.c:1061
 #, fuzzy
 msgid "Save the selected pictures on the hard disk."
@@ -2350,7 +2380,7 @@ msgstr "��������� ���̦�..."
 msgid "File '%s' deleted"
 msgstr "���� '%s' ��������"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2362,110 +2392,110 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "������ �����..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "����: '%s'"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "���˦��� ��������� ���̦� � ����� ������ڦ �� Ц����������: %d"
 
-#: src/easytag.c:3235
+#: src/easytag.c:3239
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "���˦��� ��������� ���̦� � ����� ������ڦ: %d"
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr "%u ����(��)"
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr "� ����� ������ڦ �� ���� Ц���������� ����� ���̦� MP3!"
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr "� ����� ������ڦ ����� ���̦� � �������!"
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "�����..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr "  �������� �����...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "����Ҧ�� ������� ��� ���������!"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 #, fuzzy
 msgid "Tag selected files with this field"
 msgstr "������������ �Ӧ ����� ����� ����������"
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr "��ͦ������ '_' �� '%20' �� ���¦��"
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "��ͦ������ ' ' �� '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "�������� �������"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "������ ̦������"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "� �����ϧ ̦����"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "� �����ϧ ����� ����� �����"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "�������� ���¦��"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "�������� ���¦� ����� ������� ̦�����"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 msgid "Remove duplicate spaces or underscores"
 msgstr "�������� ��������Φ ���¦�� �� Ц����������"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: ����������� ���������� (PId: %d)!."
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, fuzzy, c-format
-msgid "Received signal %s (%d)"
-msgstr "�������� ������ %s (%d)"
+msgid "Received signal %s (%d)\a"
+msgstr "�������� ������ %s (%d)\a"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 #, fuzzy
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
@@ -2476,12 +2506,12 @@ msgstr ""
 "���������� gdb ('gdb easytag core' ��Ԧ� 'bt') �� ������ j.couderc@ifrance."
 "com\n"
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "��צ����� ������"
 
-#: src/easytag.c:4466
-#, fuzzy
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2494,8 +2524,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2514,11 +2543,11 @@ msgstr ""
 "., ./             �� ����������� �������� �������.\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: ��������� ����������."
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2526,7 +2555,7 @@ msgstr ""
 "���˦ ����� �ͦ����, ��� �� ��������...\n"
 "�� � ��Ԧ�� �������� �ͦ�� ����� ������� � ��������?"
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr " �� Ħ���� ������ ����� � ��������? "
 
@@ -2623,7 +2652,7 @@ msgid ""
 "(Try setting the environment variable G_FILENAME_ENCODING)."
 msgstr ""
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 #, fuzzy
 msgid "Filename translation"
 msgstr "��������� ���� ���̦�"
@@ -2784,174 +2813,174 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "������� ����..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " ��� "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " ��� "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " � "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " ����������� "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " �������� "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " ��������� "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " ������� "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr " �������� "
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " �������� "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr " ������ "
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr " ��������... "
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "����Ҧ�� �������..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "������� ����..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 #, fuzzy
 msgid "Warning..."
 msgstr "�����..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "���������� �������� %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr "�"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr "��"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr "��"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr "��"
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr "��"
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "��������� ������ צ���������"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "��'� ������ צ��������� M3U"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "�� ������ ��������"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr "���������� �����"
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "��������� ������ צ���������"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 #, fuzzy
 msgid "Include only the selected files"
 msgstr "��������� �����Φ �ͦ�� � ��Ħ����� ������"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 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:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr "������ ���� � ������ צ���������"
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 msgid "Use relative path for files in playlist"
 msgstr "��������� ���� � ������ צ���������"
 
 #. Create playlist in parent directory
-#: src/misc.c:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr "������� ������ צ��������� � ���������� ������ڦ"
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 
 #. DOS Separator
-#: src/misc.c:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "��������������� ���Ħ����� ������Ǧ� DOS"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "�ͦ�� ������ צ���������"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr "���������� ���� ������ ���̦�"
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr "���������� �������æ� �Ǧ��� � ������ �����"
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr "���������� �������æ� �Ǧ��� �: "
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2960,12 +2989,12 @@ msgstr ""
 "C����� צ��������� '%s' ��� ���դ!\n"
 "������������?"
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "����� ������ צ���������..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2974,127 +3003,164 @@ msgstr ""
 "�� ���� �������� ������ צ��������� '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "�������� ������ צ��������� '%s'"
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 #, fuzzy
 msgid "CD"
 msgstr "CDDB"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "���� N"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "��������"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 #, fuzzy
 msgid "Composer"
 msgstr "%c : ��������"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 #, fuzzy
 msgid "Orig. Artist"
 msgstr "����������:"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr ""
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr ""
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 #, fuzzy
 msgid "Encoded by"
 msgstr "�����������:"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "������ ����"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "��:"
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 #, 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:1987
+#: src/misc.c:2033
 #, fuzzy
 msgid "the Tag"
 msgstr "����� ����..."
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "�ŭ�����-��������"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "��������: %d ����(��)"
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "����������� ������ ���̦� � ���������� �����"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 msgid "File :"
 msgstr "���� :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " ����������� "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr "�ͦ�� ������������� �����: "
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "������������ �������������� �����"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "�������� ������� ����� ������� ̦�����"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "�������� ��� �����"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr "������ ���� ���̦�: "
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "�������� �Ӧ �����Φ �����"
 
-#: src/misc.c:2828
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "��������� �����Φ �ͦ�� � ��Ħ����� ������"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "��������� �����Φ �ͦ�� � ��Ħ����� ������"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "����������"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "���������� ���� ������ ���̦�"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "������� �Ӧ �����"
+
+#: src/misc.c:3016
 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:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "�������� ������ �����"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "�������� ��� �����"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "�������� �Ӧ �����Φ �����"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "������ �� ���� ����æ�"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "����������"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "�������� �� ���� ����æ�"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3230,127 +3296,127 @@ msgstr ""
 msgid "Save file..."
 msgstr "������� ����..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr ""
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr ""
 
-#: src/picture.c:789
+#: src/picture.c:790
 #, fuzzy
 msgid "Unknown image"
 msgstr "��צ����� ������"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr ""
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr ""
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr ""
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr ""
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr ""
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr ""
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr ""
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr ""
 
-#: src/picture.c:816
+#: src/picture.c:817
 #, fuzzy
 msgid "Conductor"
 msgstr "����Ҧ"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr ""
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr ""
 
-#: src/picture.c:824
+#: src/picture.c:825
 #, fuzzy
 msgid "Recording location"
 msgstr "��������� �� ��������� ���� צ���������"
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr ""
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr ""
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr ""
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr ""
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr ""
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr ""
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr ""
 
-#: src/picture.c:840
+#: src/picture.c:841
 #, fuzzy
 msgid "Unknown picture type"
 msgstr "��צ����� ��� ����"
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 #, fuzzy
 msgid "pixels"
 msgstr "����"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr ""
 
-#: src/picture.c:881
+#: src/picture.c:882
 #, fuzzy
 msgid "Description"
 msgstr "��������������:"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
 msgstr ""
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr ""
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, fuzzy, c-format
 msgid ""
 "Can't open file :\n"
@@ -3358,7 +3424,7 @@ msgid ""
 "(%s)"
 msgstr "�� ���� צ������ ���� '%s' (%s)\n"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr ""
 
@@ -3613,25 +3679,54 @@ msgid ""
 "the program (as 'xmms -p') before to receive files as other arguments."
 msgstr ""
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "��������� ����������"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "����� ������"
+
+#: src/prefs.c:421
+#, fuzzy
+msgid "If activated, the log view would be visible in the main window."
+msgstr ""
+"���������, ��� צ���, �� ͦ����� �����, ������ ���������� ������ ��������� "
+"צ���."
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 #, fuzzy
 msgid "File Settings"
 msgstr "/���������"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 #, fuzzy
 msgid "File Options"
 msgstr "��������� ���� ���̦�"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr "��ͦ������ �� �������ͦ ������� � ���Φ ����� (��� Windows �� CD-Rom)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3640,55 +3735,55 @@ msgid ""
 msgstr ""
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 #, fuzzy
 msgid "Convert filename extension to :"
 msgstr "����������� ��¦���"
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr ""
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr ""
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 #, fuzzy
 msgid "Upper Case"
 msgstr "�������� �������"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr ""
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 #, fuzzy
 msgid "No Change"
 msgstr "�ͦ��"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr ""
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr ""
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3699,48 +3794,48 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 #, fuzzy
 msgid "Character Set for File Name"
 msgstr "������������� �����̦�"
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
 msgstr ""
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr ""
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "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 ""
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
 "looking characters."
 msgstr ""
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3749,21 +3844,21 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 #, fuzzy
 msgid "Tag Settings"
 msgstr "/���������"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "��������� ����������"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "����������� ���������� ����, ���� �� �����"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
@@ -3773,11 +3868,11 @@ msgstr ""
 "(���������, ���� ����� 2002-�� Ҧ�, ��Ħ 5 => 2005, 4 => 2004, 6 => 1996, 95 "
 "=> 1995, ����)."
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr ""
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 #, fuzzy
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
@@ -3785,11 +3880,11 @@ msgid ""
 "'10',...). Else it keeps the 'raw' track value."
 msgstr "���������, ��� ���� ������ ����� ������������� ����� ���������."
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr "OGG-�����: ���������� �������� ����� � � �����Ԧ XMMS"
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3798,17 +3893,17 @@ msgid ""
 "shown in XMMS, though."
 msgstr ""
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr ""
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr ""
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr ""
 
@@ -3816,22 +3911,22 @@ msgstr ""
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 #, fuzzy
 msgid "ID3 Tag Settings"
 msgstr "/���������"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "������� ����������"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr ""
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 #, fuzzy
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
@@ -3841,11 +3936,11 @@ msgstr ""
 "���� ������ ��Ҧ��Φ."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "�������� ����, ���� �Ӧ ���� �����Φ"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3859,11 +3954,11 @@ msgstr ""
 "�������."
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "����������� ��������æ� ���� ID3v2 ������ ���Ӧ�"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
@@ -3872,42 +3967,42 @@ msgstr ""
 "���Ӧ� ID3v2.3."
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 #, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "��������� ����� ID3v2"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "������������� �����̦�"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "��������� ����� ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "��������� ����� ID3v2"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3917,12 +4012,12 @@ msgstr ""
 "������ ���� ������ ��Ҧ��Φ."
 
 #. ID3v2 tag version
-#: src/prefs.c:716
+#: src/prefs.c:748
 #, fuzzy
 msgid "Version:"
 msgstr "��������������:"
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3931,57 +4026,57 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 #, fuzzy
 msgid "Unicode "
 msgstr "���� (UTF-8)"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "�����������:"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 #, 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:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 #, fuzzy
 msgid "No"
 msgstr "�����"
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "��� ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "��������� ����� ID3v1.x"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3989,22 +4084,22 @@ msgstr ""
 "���������, ��� �������� �� ����������� ���� ID3v1 � ˦�æ MP3-���̦�. ������ "
 "���� ������ ��Ҧ��Φ."
 
-#: src/prefs.c:846
+#: src/prefs.c:878
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "���������, �� ����������դ���� ��� ������ ��Ǧ� � ��������Ӧ ��������."
 
 #. Character Set for reading tag
-#: src/prefs.c:878
+#: src/prefs.c:910
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "������������� �����̦�"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -4021,7 +4116,7 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:914
+#: src/prefs.c:947
 #, fuzzy
 msgid "Character set used to read tag data in the file."
 msgstr "���������, �� ����������դ���� ��� ������ ��Ǧ� � ��������Ӧ ��������."
@@ -4029,55 +4124,55 @@ msgstr "���������, �� ����������դ���� ��� ������ ��Ǧ� � ��������Ӧ ��������."
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "������"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 #, fuzzy
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "������� �������������"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "������������ ������ Ц���������� '_' �� ����� '%20' �� ���¦� ' '"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "������������ ���¦� ' ' �� Ц���������� '_'"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 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:968
+#: src/prefs.c:1001
 #, fuzzy
 msgid "Rename File Scanner - Character Conversion"
 msgstr "������� �������������"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 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:994
+#: src/prefs.c:1027
 #, fuzzy
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "������� �������������"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1001
+#: src/prefs.c:1034
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1005
+#: src/prefs.c:1038
 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 "
@@ -4086,15 +4181,15 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "����� �������"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "�������� צ��� ������� �� ������� ������"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4102,11 +4197,11 @@ msgstr ""
 "���������, ��� צ��� ������� ����������� צ���������� �� ������� ������ "
 "EasyTAG."
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "����� ������� ������ ������"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4115,37 +4210,37 @@ msgstr ""
 "צ���."
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr "����"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "�������������� ���� � �����Ӧ ���������� ��Ǧ�"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "����� �� ������� ��������:"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 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:1072
+#: src/prefs.c:1105
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 
-#: src/prefs.c:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4154,45 +4249,45 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr ""
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 msgid "Server Settings for Automatic Search"
 msgstr ""
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "�����: "
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "����: "
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "���� �� CGI: "
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "��������� �������"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "����� � CDDB"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 #, fuzzy
 msgid "Path :"
 msgstr "���� �� CGI: "
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4201,66 +4296,66 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "��������� ����Ӧ"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "��������������� ����Ӧ"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr "��������� ��������� ����Ӧ-�������."
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "������: "
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "��'� ����Ӧ-�������."
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "���� ����Ӧ-�������."
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "��'� �����������: "
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "��'� ����������� ��� ����Ӧ-�������."
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "������: "
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr "������ ����������� ��� ����Ӧ-�������."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 #, fuzzy
 msgid "Track Name List"
 msgstr "����� �����"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4269,15 +4364,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "������������"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "������������ ������ � ��������"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4285,53 +4380,57 @@ msgstr ""
 "���� ����������, ����� Ħ������� צ��� �� ������� Ц����������� ����� "
 "������� � ��������."
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "������������ ������ ���� �� �����"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "������������ �������������� �����"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "������������ ��������� �����"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "������������ ������ ������ צ���������"
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr "����������� �ͦ�� (��� �� ���Ҧ����) �� ������� צ���"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "������� צ��� ��� ����������"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 msgid "Save changes and close this window"
 msgstr "�������� �ͦ�� � ������� �� צ���"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "�ͦ�� ���������Φ"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "���Ʀ����æ� ���������"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "���Ʀ����æ� �� �ͦ����"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, fuzzy, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4342,11 +4441,11 @@ msgstr ""
 "%s\n"
 "(%s)"
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "�� �� �������"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
@@ -4364,36 +4463,36 @@ msgstr "�������������� ��������"
 msgid "Process Fields"
 msgstr "������� ��̦�"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "��� ������������..."
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "��� ������������... (%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "������� �������: �� ���� ������ ���Ħ����� '%s' � '%s'"
 
-#: src/scan.c:660
+#: src/scan.c:663
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 
-#: src/scan.c:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "���� ��'� ����� ������������..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "���� ��'� ����� ������������... (%s)"
@@ -4401,57 +4500,57 @@ 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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "���������� ���� �� ���Φ �����"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 msgid "Scanner:"
 msgstr "������: "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "����Ҧ��, ���� ��� ������� �����������"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 #, fuzzy
 msgid "Open scanner window / Scan selected files"
 msgstr "��������� ��Ħ��Φ �����"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "��������� �������"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "��������/������� �������� �����"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "��������/������� �������"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "������� צ���"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 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:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "�������� ��������..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4460,211 +4559,212 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "�������� ������: �������������� �����..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "����Ҧ�� ����:"
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 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:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr "�"
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "����������� ���� ���Φ �����"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "�"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "�"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "�"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "����������� ���� �������"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "��"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "����������� ���� �����"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 #, fuzzy
 msgid "Cm"
 msgstr "�"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 #, fuzzy
 msgid "Cp"
 msgstr "�"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 #, fuzzy
 msgid "Process composer field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr ""
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 #, fuzzy
 msgid "Process original artist field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 #, fuzzy
 msgid "Cr"
 msgstr "�"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 #, fuzzy
 msgid "Process copyright field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr ""
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 #, fuzzy
 msgid "Process URL field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr ""
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 #, fuzzy
 msgid "Process encoder name field"
 msgstr "����������� ���� ���Φ �����"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "����������� ��¦���"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "�������/��������� ��¦���."
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "������������ '_'�� '%20' �� ' '"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 #, fuzzy
 msgid "Convert:"
 msgstr "����: "
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 #, fuzzy
 msgid "to: "
 msgstr "�: "
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 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:2169
+#: src/scan.c:2284
 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:2171
-msgid "Replace a character by an other one."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 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:2206
+#: src/scan.c:2322
 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:2209
+#: src/scan.c:2325
 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:2212
+#: src/scan.c:2328
 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:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr "�������� ������� ����� ������� ̦�����"
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr "�������� ��������Φ ���¦�� �� Ц����������"
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4673,187 +4773,187 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "�������"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a : ����������"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b : ������"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c : ��������"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, fuzzy, c-format
 msgid "%p : composer"
 msgstr "%c : ��������"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr ""
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr ""
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, fuzzy, c-format
 msgid "%e : encoded by"
 msgstr "�����������:"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g : �����"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : �����դ����"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l : ˦��˦��� ���˦�"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, fuzzy, c-format
 msgid "%o : orig. artist"
 msgstr "%a : ����������"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n : ����"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t : �����"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr ""
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y : Ҧ�"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "�������� �����"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "�������� ���� �����"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "������ �� ���� ����æ�"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "�������� �� ���� ����æ�"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "��������� �����"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "������ ������"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "�������� �����"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "�������� �����"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "����_�����"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr "�������: �� ������� �����!"
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr "��������: �� ������� �����!"
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr "�ͦ����� �����: �� ������� �����!"
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr "�ͦ����� ����: �� ������� �����!"
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "�������: �� ���� �������� ���� �������Ҧ�: %s (%s)"
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "�� ���� צ������ ���� �������Ҧ� '%s' (%s)"
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr "������������ ������� �������Ҧ�..."
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, fuzzy, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "�� ���� צ������ ���� '%s' (%s)"
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "�������: �� ���� �������� ������ � ����: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "������������ �����ϧ ����� '��������� ����'..."
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr "������������ �����ϧ ����� '������������� �����'..."
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 #, fuzzy
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "������������ �����ϧ ����� '������������� �����'..."
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "�������: �ͦ��� HOME �� ���������!\n"
 "\n"
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "�������: �� ���� �������� ������� '%s' (%s)!"
@@ -4939,6 +5039,33 @@ msgstr "����������� ���������"
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "������ �Ŧ������� ����!:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "�ŭ�����-��������"
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "�ͦ�� ������������� �����: "
+
+#~ msgid "Files Name List :"
+#~ msgstr "������ ���� ���̦�: "
+
+#, fuzzy
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(������� OGG ��������)"
+
+#, fuzzy
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(������� OGG ��������)"
+
 #, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "��צ��� ���Ӧ� ����"
@@ -5415,9 +5542,6 @@ msgstr ""
 #~ msgid "Dotted"
 #~ msgstr "�������"
 
-#~ msgid "Tabbed"
-#~ msgstr "����������"
-
 #~ msgid "Select the style of the line in the browser tree."
 #~ msgstr "����Ҧ�� ����� ̦Φ� � צ�Φ �����������."
 
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 45b2258..c97eff2 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6e10624..fde7579 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag 1.99.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 00:08+0200\n"
+"POT-Creation-Date: 2007-10-15 23:53+0200\n"
 "PO-Revision-Date: 2006-05-12 09:36+0800\n"
 "Last-Translator:  <shannleon@gmail.com>\n"
 "Language-Team: Chinese <i18n-translation@lists.linux.net.cn>\n"
@@ -16,196 +16,237 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:122
+#: src/about.c:134
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
 "Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
 "GTK+ interface makes tagging easier under GNU/Linux."
 msgstr ""
 
-#: src/about.c:131 src/about.c:132 src/about.c:133 src/about.c:134
+#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
 msgid "(German translation)"
 msgstr "(德语翻译)"
 
-#: src/about.c:135 src/about.c:136
+#: src/about.c:146 src/about.c:147
 msgid "(Russian translation)"
 msgstr "(俄语翻译)"
 
-#: src/about.c:137 src/about.c:138
+#: src/about.c:148 src/about.c:149
 msgid "(Dutch translation)"
 msgstr "(荷兰语翻译)"
 
-#: src/about.c:139 src/about.c:140
+#: src/about.c:150 src/about.c:151
 msgid "(Swedish translation)"
 msgstr "(瑞典语翻译)"
 
-#: src/about.c:141 src/about.c:142 src/about.c:143
+#: src/about.c:152 src/about.c:153 src/about.c:154
 msgid "(Hungarian translation)"
 msgstr "(匈牙利语翻译)"
 
-#: src/about.c:144 src/about.c:145
+#: src/about.c:155 src/about.c:156
 msgid "(Italian translation)"
 msgstr "(意大利语翻译)"
 
-#: src/about.c:146
+#: src/about.c:157
 msgid "(Japanese translation)"
 msgstr "(日语翻译)"
 
-#: src/about.c:147 src/about.c:148
+#: src/about.c:158 src/about.c:159
 msgid "(Ukrainian translation)"
 msgstr ""
 
-#: src/about.c:149 src/about.c:150
+#: src/about.c:160 src/about.c:161
 msgid "(Czech translation)"
 msgstr "(捷克语翻译)"
 
-#: src/about.c:151 src/about.c:152 src/about.c:153
+#: src/about.c:162 src/about.c:163 src/about.c:164
 msgid "(Spanish translation)"
 msgstr "(西班牙语翻译)"
 
-#: src/about.c:154
+#: src/about.c:165
 msgid "(Polish translation)"
 msgstr "(波兰语翻译)"
 
-#: src/about.c:155
+#: src/about.c:166
 msgid "(Romanian translation)"
 msgstr "(罗马尼亚语翻译)"
 
-#: src/about.c:156
+#: src/about.c:167
 msgid "(Danish translation)"
 msgstr "(丹麦语翻译)"
 
-#: src/about.c:157
+#: src/about.c:168
 msgid "(Greek translation)"
 msgstr "(希腊语翻译)"
 
-#: src/about.c:158
+#: src/about.c:169
 msgid "(Brazilian Portuguese translation)"
 msgstr "(巴西葡萄牙语翻译)"
 
-#: src/about.c:159
+#: src/about.c:170
 msgid "(Bulgarian translation)"
 msgstr "(保加利亚语翻译)"
 
-#: src/about.c:160
+#: src/about.c:171
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(日语翻译)"
 
-#: src/about.c:161
+#: src/about.c:172
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(希腊语翻译)"
 
+#: src/about.c:173
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(德语翻译)"
+
+#: src/about.c:226
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:227
+msgid "Status"
+msgstr ""
+
+#: src/about.c:228 src/misc.c:1966
+msgid "Comment"
+msgstr "备注"
+
 #. Config
-#: src/about.c:222
+#: src/about.c:244
 msgid "About..."
 msgstr "关于..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:240 src/bar.c:236
+#: src/about.c:262 src/bar.c:236
 msgid "About"
 msgstr "关于"
 
-#: src/about.c:271
+#: src/about.c:293
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(编译于： %s)"
 
-#: src/about.c:276
+#: src/about.c:297
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(使用： GTK+ %d.%d.%d 与 id3lib %d.%d.%d)"
 
-#: src/about.c:283
-#, fuzzy, c-format
-msgid "(MP3 file support enabled using: libid3tag %s)"
-msgstr "(MP4/AAC 文件支持被禁止)"
+#: src/about.c:305
+#, c-format
+msgid "Author: %s"
+msgstr "作者： %s"
 
-#: src/about.c:287
-#, fuzzy, c-format
-msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-msgstr "(MP4/AAC 文件支持被禁止)"
+#: src/about.c:309 src/easytag.c:212
+#, c-format
+msgid "E-mail: %s"
+msgstr "电子邮件： %s"
+
+#: src/about.c:315
+msgid "Web Page: "
+msgstr "Web 页面："
+
+#: src/about.c:328
+msgid "Description:"
+msgstr "描述："
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:344
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:390
+#, c-format
+msgid "libid3tag %s"
+msgstr ""
 
-#: src/about.c:292
+#: src/about.c:394
 #, fuzzy
-msgid "(ID3v2.3 tags  support disabled)"
+msgid "MP3 file support"
 msgstr "(MP4/AAC 文件支持被禁止)"
 
-#: src/about.c:296
-#, fuzzy, c-format
-msgid "(MP3 file support disabled)"
+#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
+#: src/about.c:452 src/about.c:462
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:399 src/about.c:413 src/about.c:424 src/about.c:434
+#: src/about.c:444 src/about.c:454 src/about.c:464
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:404
+#, c-format
+msgid "id3lib %d.%d.%d"
+msgstr ""
+
+#: src/about.c:408
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
 msgstr "(MP4/AAC 文件支持被禁止)"
 
-#: src/about.c:302
-msgid "(Ogg Vorbis file support disabled)"
+#: src/about.c:410
+msgid "available"
+msgstr ""
+
+#: src/about.c:420
+#, fuzzy
+msgid "Ogg Vorbis file support"
 msgstr "(Ogg Vorbis 文件支持被禁止)"
 
-#: src/about.c:307
+#: src/about.c:430
 #, fuzzy
-msgid "(Speex file support disabled)"
+msgid "Speex file support"
 msgstr "(MP4/AAC 文件支持被禁止)"
 
-#: src/about.c:312
-msgid "(FLAC file support disabled)"
+#: src/about.c:440
+#, fuzzy
+msgid "FLAC file support"
 msgstr "(FLAC 文件支持被禁止)"
 
-#: src/about.c:317
-msgid "(MP4/AAC file support disabled)"
+#: src/about.c:450
+#, fuzzy
+msgid "MP4/AAC file support"
 msgstr "(MP4/AAC 文件支持被禁止)"
 
-#: src/about.c:322
+#: src/about.c:460
 #, fuzzy
-msgid "(WavPack file support disabled)"
+msgid "WavPack file support"
 msgstr "(MP4/AAC 文件支持被禁止)"
 
-#: src/about.c:330
-#, c-format
-msgid "Author: %s"
-msgstr "作者： %s"
-
-#: src/about.c:334 src/easytag.c:212
-#, c-format
-msgid "E-mail: %s"
-msgstr "电子邮件： %s"
-
-#: src/about.c:340
-msgid "Web Page: "
-msgstr "Web 页面："
-
-#: src/about.c:352
-msgid "Description:"
-msgstr "描述："
-
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:368
+#: src/about.c:473
 msgid "Thanks"
 msgstr "致谢"
 
-#: src/about.c:388
+#: src/about.c:493
 msgid "Translations:\n"
 msgstr "翻译：\n"
 
-#: src/about.c:416
+#: src/about.c:521
 msgid "General:\n"
 msgstr "一般：\n"
 
-#: src/about.c:433
+#: src/about.c:538
 msgid "Changes"
 msgstr "变更"
 
-#: src/about.c:455
+#: src/about.c:560
 #, 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:4385 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1763 src/mp4_header.c:211
+#: src/id3_tag.c:1185 src/id3_tag.c:1255 src/misc.c:1809 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:94 src/mp4_tag.c:105 src/mp4_tag.c:234
 #: src/mp4_tag.c:243 src/mpeg_header.c:209 src/ogg_header.c:82
 #: src/ogg_header.c:186 src/ogg_tag.c:139 src/ogg_tag.c:533
@@ -540,7 +581,7 @@ msgstr "重命名目录..."
 msgid "Reload Directory"
 msgstr "重新载入目录"
 
-#: src/bar.c:216 src/browser.c:3614
+#: src/bar.c:216 src/browser.c:3641
 msgid "Browse Directory with ..."
 msgstr "使用其他程序浏览目录..."
 
@@ -686,7 +727,7 @@ msgstr "新的选择文件默认目录"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4538 src/easytag.c:4558 src/easytag.c:4577
+#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
 msgid "Confirm..."
 msgstr "确认..."
 
@@ -698,107 +739,96 @@ msgstr ""
 "有些文件被更改了但却没有保存...\n"
 "您希望在变更目录前保存它们吗？"
 
-#: src/browser.c:827
-#, c-format
-msgid ""
-"The entered path is invalid!:\n"
-"%s\n"
-"(%s)"
-msgstr ""
-"键入的目录非法：\n"
-"%s\n"
-"(%s)"
-
-#. Log_Print(msg);
-#: src/browser.c:829 src/browser.c:3378 src/browser.c:3393 src/browser.c:3453
-#: src/browser.c:3488 src/browser.c:3514 src/browser.c:3958 src/browser.c:3971
-#: src/easytag.c:2595 src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786
-#: src/easytag.c:2818 src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925
-#: src/easytag.c:2943 src/easytag.c:3146 src/id3_tag.c:541 src/misc.c:1674
-#: src/picture.c:1082 src/prefs.c:1706 src/prefs.c:1808
-msgid "Error..."
-msgstr "错误..."
-
-#: src/browser.c:2016
+#: src/browser.c:2040
 #, fuzzy
 msgid "<All albums>"
 msgstr "# 专辑"
 
-#: src/browser.c:2410
+#: src/browser.c:2434
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
 
-#: src/browser.c:2777 src/cddb.c:436 src/cddb.c:723 src/misc.c:1914
+#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
 msgid "Artist"
 msgstr "艺术家"
 
-#: src/browser.c:2777
+#: src/browser.c:2801
 msgid "# Albums"
 msgstr "# 专辑"
 
-#: src/browser.c:2777 src/browser.c:2778
+#: src/browser.c:2801 src/browser.c:2802
 msgid "# Files"
 msgstr "# 文件"
 
-#: src/browser.c:2778 src/cddb.c:437 src/cddb.c:724 src/misc.c:1915
+#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
 msgid "Album"
 msgstr "专辑"
 
-#: src/browser.c:2798
+#: src/browser.c:2822
 msgid "Go to parent directory"
 msgstr "前往上层目录"
 
-#: src/browser.c:2815
+#: src/browser.c:2839
 msgid "Enter a directory to browse."
 msgstr "键入目录以浏览。"
 
-#: src/browser.c:2890
+#: src/browser.c:2914
 msgid "Tree"
 msgstr "树"
 
-#: src/browser.c:2933
+#: src/browser.c:2957
 msgid "Artist & Album"
 msgstr "艺术家 & 专辑"
 
-#: src/browser.c:3179
+#: src/browser.c:3206
 msgid "Rename the directory"
 msgstr "重命名目录"
 
-#: src/browser.c:3195
+#: src/browser.c:3222
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "重命名目录 “%s” 为： "
 
-#: src/browser.c:3214 src/misc.c:1297
+#: src/browser.c:3241 src/misc.c:1342
 msgid "Use mask :"
 msgstr "使用掩码："
 
-#: src/browser.c:3217
+#: src/browser.c:3244
 msgid "If activated, it will use masks to rename directory."
 msgstr "如果激活，则会使用掩码重命名目录。"
 
-#: src/browser.c:3236
+#: src/browser.c:3263
 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:3256 src/misc.c:1317 src/misc.c:1414 src/scan.c:1941
-#: src/scan.c:2008 src/scan.c:2349
+#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
+#: src/scan.c:2119 src/scan.c:2465
 msgid "Invalid Scanner Mask"
 msgstr "非法的扫描器掩码"
 
 #. Preview label
-#: src/browser.c:3262
+#: src/browser.c:3289
 msgid "Rename directory preview..."
 msgstr "重命名目录预览..."
 
-#: src/browser.c:3378
+#. Log_Print(msg);
+#: src/browser.c:3405 src/browser.c:3420 src/browser.c:3480 src/browser.c:3515
+#: src/browser.c:3541 src/browser.c:3985 src/browser.c:3999 src/easytag.c:2595
+#: src/easytag.c:2739 src/easytag.c:2771 src/easytag.c:2786 src/easytag.c:2818
+#: src/easytag.c:2856 src/easytag.c:2903 src/easytag.c:2925 src/easytag.c:2943
+#: src/easytag.c:3148 src/id3_tag.c:541 src/misc.c:1720 src/picture.c:1083
+#: src/prefs.c:1739 src/prefs.c:1841
+msgid "Error..."
+msgstr "错误..."
+
+#: src/browser.c:3405
 msgid "You must type a directory name!"
 msgstr "您必须输入一个目录名！"
 
-#: src/browser.c:3393
+#: src/browser.c:3420
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -825,14 +855,14 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3451
+#: src/browser.c:3478
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
 "(%s)"
 msgstr ""
 
-#: src/browser.c:3486 src/browser.c:3512
+#: src/browser.c:3513 src/browser.c:3539
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -842,47 +872,47 @@ msgid ""
 "(%s)"
 msgstr ""
 
-#: src/browser.c:3555
+#: src/browser.c:3582
 msgid "Directory renamed"
 msgstr "目录已重命名"
 
-#: src/browser.c:3633 src/browser.c:3793
+#: src/browser.c:3660 src/browser.c:3820
 msgid "Program to run :"
 msgstr "要运行的程序："
 
-#: src/browser.c:3645
+#: src/browser.c:3672
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 
-#: src/browser.c:3774
+#: src/browser.c:3801
 msgid "Open File with ..."
 msgstr "使用其他程序打开文件..."
 
-#: src/browser.c:3805
+#: src/browser.c:3832
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 
-#: src/browser.c:3958
+#: src/browser.c:3985
 msgid "You must type a program name!"
 msgstr "您必须输入一个程序名！"
 
-#: src/browser.c:3970 src/misc.c:897
+#: src/browser.c:3998 src/misc.c:942
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "程序 “%s” 无法被找到！"
 
-#: src/browser.c:4019 src/misc.c:943
+#: src/browser.c:4047 src/misc.c:988
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr ""
 
-#: src/browser.c:4038 src/misc.c:982
+#: src/browser.c:4066 src/misc.c:1027
 msgid "Can't fork another process!\n"
 msgstr ""
 
-#: src/browser.c:4072
+#: src/browser.c:4100
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr ""
@@ -966,7 +996,7 @@ msgstr "寻找："
 msgid "All Fields"
 msgstr "所有列"
 
-#: src/cddb.c:439 src/picture.c:798 src/prefs.c:768
+#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
 msgid "Other"
 msgstr "其他"
 
@@ -1041,7 +1071,7 @@ msgstr "类别"
 msgid "Results :"
 msgstr "结果："
 
-#: src/cddb.c:529 src/misc.c:1966
+#: src/cddb.c:529 src/misc.c:2012
 msgid "Search :"
 msgstr "搜索："
 
@@ -1070,7 +1100,7 @@ msgstr "取消选择所有行"
 msgid "Invert lines selection"
 msgstr "反向选择行"
 
-#: src/cddb.c:589 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1498
 msgid "Select all lines"
 msgstr "选择所有行"
 
@@ -1092,15 +1122,15 @@ msgstr ""
 msgid "All"
 msgstr "所有"
 
-#: src/cddb.c:721 src/misc.c:1912
+#: src/cddb.c:721 src/misc.c:1958
 msgid "File Name"
 msgstr "文件名"
 
-#: src/cddb.c:722 src/misc.c:1913
+#: src/cddb.c:722 src/misc.c:1959
 msgid "Title"
 msgstr "标题"
 
-#: src/cddb.c:725 src/misc.c:1917
+#: src/cddb.c:725 src/misc.c:1963
 msgid "Year"
 msgstr "年"
 
@@ -1112,12 +1142,12 @@ msgstr "音轨 #"
 msgid "# Tracks"
 msgstr "# 音轨"
 
-#: src/cddb.c:728 src/misc.c:1919
+#: src/cddb.c:728 src/misc.c:1965
 msgid "Genre"
 msgstr "流派"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:2825
+#: src/cddb.c:765 src/misc.c:3013
 msgid "Run the current scanner for each file"
 msgstr ""
 
@@ -1129,7 +1159,7 @@ 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:777 src/prefs.c:1329
+#: src/cddb.c:777 src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1142,86 +1172,86 @@ msgstr ""
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 
-#: src/cddb.c:798 src/misc.c:2209
+#: src/cddb.c:798 src/misc.c:2255
 msgid "Ready to search..."
 msgstr "搜索准备就绪..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1318
 #, 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:1507
+#: src/cddb.c:1508
 msgid "Invert selection"
 msgstr "反向选择"
 
-#: src/cddb.c:1514
+#: src/cddb.c:1516
 msgid "Sort by Track Number"
 msgstr "按音轨号排序"
 
-#: src/cddb.c:1518
+#: src/cddb.c:1521
 msgid "Sort by Track Name"
 msgstr "按音轨名排序"
 
-#: src/cddb.c:1615
+#: src/cddb.c:1619
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "正在解析主机 “%s”..."
 
-#: src/cddb.c:1623
+#: src/cddb.c:1627
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "无法解析主机 “%s” (%s)！"
 
-#: src/cddb.c:1638
+#: src/cddb.c:1642
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "无法创建新套接字 (%s)！"
 
 #. Open connection to the server
-#: src/cddb.c:1652
+#: src/cddb.c:1656
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "正在连接主机 “%s”，端口 “%d” ..."
 
-#: src/cddb.c:1659
+#: src/cddb.c:1663
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "无法连接主机 “%s” (%s)！"
 
-#: src/cddb.c:1665
+#: src/cddb.c:1669
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "已连接主机 “%s”"
 
-#: src/cddb.c:1748
+#: src/cddb.c:1752
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "接受数据 (%s) ..."
 
-#: src/cddb.c:1758
+#: src/cddb.c:1764
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr ""
 
-#: src/cddb.c:1765
+#: src/cddb.c:1770
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "无法打开文件 “%s” (%s)\n"
 
-#: src/cddb.c:1808 src/misc.c:2980 src/setting.c:1304
+#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "无法打开文件 “%s” (%s)"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2238 src/cddb.c:2547 src/cddb.c:3360
+#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
 msgid "Sending request ..."
 msgstr "发送请求 ..."
 
-#: src/cddb.c:2242 src/cddb.c:2551 src/cddb.c:3097 src/cddb.c:3364
+#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "无法发送请求 (%s)！"
@@ -1230,90 +1260,90 @@ msgstr "无法发送请求 (%s)！"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2264 src/cddb.c:3110 src/cddb.c:3373
+#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
 msgid "Receiving data ..."
 msgstr "接受数据 ..."
 
-#: src/cddb.c:2271 src/cddb.c:2580 src/cddb.c:3117 src/cddb.c:3380
+#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
 msgid "The server returned a wrong answer!"
 msgstr ""
 
-#: src/cddb.c:2285 src/cddb.c:2596 src/cddb.c:3132 src/cddb.c:3395
+#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr ""
 
-#: src/cddb.c:2423
+#: src/cddb.c:2440
 msgid "Sorry, the web-based search is currently down!"
 msgstr ""
 
-#: src/cddb.c:2425 src/cddb.c:2759
+#: src/cddb.c:2442 src/cddb.c:2785
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "找到 %d 个符合的专辑"
 
-#: src/cddb.c:2568
+#: src/cddb.c:2585
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "接受数据 (%s) ..."
 
-#: src/cddb.c:2570
+#: src/cddb.c:2587
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "接受数据 (%s) ..."
 
-#: src/cddb.c:2733
+#: src/cddb.c:2752
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2855
+#: src/cddb.c:2881
 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:2863
+#: src/cddb.c:2889
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2869
+#: src/cddb.c:2895
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d 个文件被选择"
 
-#: src/cddb.c:2945
+#: src/cddb.c:2970
 #, fuzzy
 msgid "Local CD search..."
 msgstr "搜索准备就绪..."
 
-#: src/cddb.c:2945
+#: src/cddb.c:2971
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3087
+#: src/cddb.c:3115
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr ""
 
-#: src/cddb.c:3231
+#: src/cddb.c:3268
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "找到 %d 个符合的专辑"
 
-#: src/cddb.c:3327
+#: src/cddb.c:3364
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "无法打开文件 “%s” (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3576
+#: src/cddb.c:3622
 msgid "Loading album track list ..."
 msgstr "正在载入专辑音轨列表 ..."
 
-#: src/cddb.c:3751
+#: src/cddb.c:3797
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1322,7 +1352,7 @@ msgid ""
 "Do you want to continue ?"
 msgstr ""
 
-#: src/cddb.c:3754
+#: src/cddb.c:3800
 msgid "Write Tag from CDDB..."
 msgstr "从 CDDB 写入标签"
 
@@ -1594,11 +1624,11 @@ msgstr ""
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4060 src/mpeg_header.c:354
+#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr ""
 
-#: src/easytag.c:469 src/easytag.c:4061
+#: src/easytag.c:469 src/easytag.c:4067
 msgid "?, Layer ?"
 msgstr ""
 
@@ -1606,7 +1636,7 @@ msgstr ""
 msgid "Bitrate:"
 msgstr "比特率："
 
-#: src/easytag.c:476 src/easytag.c:4062
+#: src/easytag.c:476 src/easytag.c:4068
 msgid "? kb/s"
 msgstr ""
 
@@ -1614,17 +1644,17 @@ msgstr ""
 msgid "Freq:"
 msgstr "频率："
 
-#: src/easytag.c:483 src/easytag.c:4063
+#: src/easytag.c:483 src/easytag.c:4069
 msgid "? Hz"
 msgstr ""
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4064 src/mpeg_header.c:377
+#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "模式："
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4065 src/easytag.c:4066
-#: src/easytag.c:4067
+#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
+#: src/easytag.c:4073
 msgid "?"
 msgstr ""
 
@@ -1804,11 +1834,11 @@ msgid "Tag selected files with these pictures"
 msgstr ""
 
 #: src/easytag.c:1045
-msgid "Remove selected pictures, else all pictures."
+msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr ""
 
 #: src/easytag.c:1051
-msgid "Add pictures to the tag (drag and drop is also available)."
+msgid "Remove selected pictures, else all pictures."
 msgstr ""
 
 #: src/easytag.c:1061
@@ -2154,7 +2184,7 @@ msgstr "删除文件..."
 msgid "File '%s' deleted"
 msgstr "文件 “%s” 已删除"
 
-#: src/easytag.c:3145
+#: src/easytag.c:3147
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2163,121 +2193,121 @@ msgid ""
 msgstr ""
 
 #. Read the directory recursively
-#: src/easytag.c:3166
+#: src/easytag.c:3170
 msgid "Search in progress..."
 msgstr "搜索进行中..."
 
-#: src/easytag.c:3183 src/et_core.c:2612
+#: src/easytag.c:3187 src/et_core.c:2612
 #, c-format
 msgid "File: '%s'"
 msgstr "文件： “%s”"
 
-#: src/easytag.c:3233
+#: src/easytag.c:3237
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr ""
 
-#: src/easytag.c:3235
+#: src/easytag.c:3239
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr ""
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3248 src/et_core.c:2696
+#: src/easytag.c:3252 src/et_core.c:2696
 #, c-format
 msgid "%u file(s)"
 msgstr ""
 
-#: src/easytag.c:3254
+#: src/easytag.c:3258
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 
-#: src/easytag.c:3256
+#: src/easytag.c:3260
 msgid "No file found in this directory!"
 msgstr ""
 
-#: src/easytag.c:3342
+#: src/easytag.c:3348
 msgid "Searching..."
 msgstr "正在搜索..."
 
 #. Button to stop...
-#: src/easytag.c:3362
+#: src/easytag.c:3368
 msgid "  STOP the search...  "
 msgstr " 停止搜索... "
 
 #. Open the last selected scanner
-#: src/easytag.c:4087
+#: src/easytag.c:4093
 msgid "Select a directory to browse!"
 msgstr "选择目录以浏览！"
 
 #. Menu items
-#: src/easytag.c:4223
+#: src/easytag.c:4229
 msgid "Tag selected files with this field"
 msgstr ""
 
-#: src/easytag.c:4234
+#: src/easytag.c:4240
 msgid "Convert '_' and '%20' to spaces"
 msgstr ""
 
-#: src/easytag.c:4241 src/scan.c:2134
+#: src/easytag.c:4247 src/scan.c:2245
 msgid "Convert ' ' to '_'"
 msgstr "转换 “ ” 为 “_”"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4252 src/scan.c:2178
+#: src/easytag.c:4258 src/scan.c:2294
 msgid "All uppercase"
 msgstr "所有字母大写"
 
-#: src/easytag.c:4259 src/scan.c:2179
+#: src/easytag.c:4265 src/scan.c:2295
 msgid "All downcase"
 msgstr "所有字母小写"
 
-#: src/easytag.c:4266 src/scan.c:2180
+#: src/easytag.c:4272 src/scan.c:2296
 msgid "First letter uppercase"
 msgstr "第一个字母大写"
 
-#: src/easytag.c:4273 src/scan.c:2181
+#: src/easytag.c:4279 src/scan.c:2297
 msgid "First letter uppercase of each word"
 msgstr "每个词第一个字母大写"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4284 src/scan.c:2220
+#: src/easytag.c:4290 src/scan.c:2336
 msgid "Remove spaces"
 msgstr "删除空格"
 
-#: src/easytag.c:4291
+#: src/easytag.c:4297
 msgid "Insert space before uppercase letter"
 msgstr "大写字母前插入空格"
 
-#: src/easytag.c:4298
+#: src/easytag.c:4304
 msgid "Remove duplicate spaces or underscores"
 msgstr "产出多余的空格或下划线"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4318 src/easytag.c:4326
+#: src/easytag.c:4324 src/easytag.c:4332
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s： 非正常退出！(PId： %d)。"
 
-#: src/easytag.c:4319 src/easytag.c:4328
+#: src/easytag.c:4325 src/easytag.c:4334
 #, fuzzy, c-format
-msgid "Received signal %s (%d)"
+msgid "Received signal %s (%d)\a"
 msgstr "收到信号 %s (%d) \n"
 
-#: src/easytag.c:4321 src/easytag.c:4330
+#: src/easytag.c:4327 src/easytag.c:4336
 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@gmail.com"
 msgstr ""
 
-#: src/easytag.c:4457
+#: src/easytag.c:4463
 msgid "Unknown signal"
 msgstr "未知信号"
 
-#: src/easytag.c:4466
-#, fuzzy
+#: src/easytag.c:4479
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2290,8 +2320,7 @@ msgid ""
 "\n"
 "Directory:\n"
 "----------\n"
-"c:/path_to/files  Use an absolute path to load,\n"
-"/path_to/files    Use an absolute path to load,\n"
+"%s/path_to/files  Use an absolute path to load,\n"
 "path_to/files     Use a relative path.\n"
 "\n"
 msgstr ""
@@ -2310,17 +2339,17 @@ msgstr ""
 "path_to/files     使用相对路径。\n"
 "\n"
 
-#: src/easytag.c:4495
+#: src/easytag.c:4507
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG： 正常退出。"
 
-#: src/easytag.c:4538 src/easytag.c:4577
+#: src/easytag.c:4550 src/easytag.c:4589
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
 msgstr ""
 
-#: src/easytag.c:4558
+#: src/easytag.c:4570
 msgid " Do you really want to exit the program? "
 msgstr " 您是否真要退出程序？ "
 
@@ -2415,7 +2444,7 @@ msgid ""
 "(Try setting the environment variable G_FILENAME_ENCODING)."
 msgstr ""
 
-#: src/et_core.c:3060 src/scan.c:661
+#: src/et_core.c:3060 src/scan.c:664
 msgid "Filename translation"
 msgstr ""
 
@@ -2448,7 +2477,7 @@ msgstr "声道："
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "打开文件 “%s” (%s) 时发生错误。\n"
-""
+"\a"
 
 #: src/flac_tag.c:983 src/ogg_tag.c:752
 #, c-format
@@ -2577,306 +2606,343 @@ msgstr ""
 msgid "Corrupted file..."
 msgstr "保存文件..."
 
-#: src/log.c:89
+#: src/log.c:91
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:211
+#: src/misc.c:214
 msgid " OK "
 msgstr " 确认 "
 
-#: src/misc.c:216
+#: src/misc.c:219
 msgid " Yes "
 msgstr " 是 "
 
-#: src/misc.c:221
+#: src/misc.c:224
 msgid " No "
 msgstr " 否 "
 
-#: src/misc.c:226
+#: src/misc.c:229
 msgid " Apply "
 msgstr " 应用 "
 
-#: src/misc.c:231
+#: src/misc.c:234
 msgid " Save "
 msgstr " 保存 "
 
-#: src/misc.c:236
+#: src/misc.c:239
 msgid " Cancel "
 msgstr " 取消 "
 
-#: src/misc.c:241
+#: src/misc.c:244
 msgid " Close "
 msgstr " 关闭 "
 
-#: src/misc.c:246
+#: src/misc.c:249
 msgid " Write "
 msgstr ""
 
-#: src/misc.c:251
+#: src/misc.c:254
 msgid " Execute "
 msgstr " 执行 "
 
-#: src/misc.c:256
+#: src/misc.c:259
 msgid " Search "
 msgstr " 搜索 "
 
-#: src/misc.c:261
+#: src/misc.c:264
 msgid " Browse... "
 msgstr " 浏览... "
 
-#: src/misc.c:811
+#: src/misc.c:856
 msgid "Select directory..."
 msgstr "选择目录..."
 
-#: src/misc.c:816
+#: src/misc.c:861
 msgid "Select file..."
 msgstr "选择文件..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 #, fuzzy
 msgid "Warning..."
 msgstr "正在搜索..."
 
-#: src/misc.c:886
+#: src/misc.c:931
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:988
+#: src/misc.c:1033
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr ""
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "B"
 msgstr ""
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "KB"
 msgstr ""
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "MB"
 msgstr ""
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "GB"
 msgstr ""
 
-#: src/misc.c:1153 src/misc.c:1172
+#: src/misc.c:1198 src/misc.c:1217
 msgid "TB"
 msgstr ""
 
-#: src/misc.c:1267
+#: src/misc.c:1312
 msgid "Generate a playlist"
 msgstr "生成播放列表"
 
-#: src/misc.c:1291
+#: src/misc.c:1336
 msgid "M3U Playlist Name"
 msgstr "M3U 播放列表名"
 
-#: src/misc.c:1304
+#: src/misc.c:1349
 msgid "Use directory name"
 msgstr "使用目录名"
 
-#: src/misc.c:1328 src/misc.c:1425
+#: src/misc.c:1373 src/misc.c:1470
 msgid "Edit Masks"
 msgstr ""
 
 #. Playlist options
-#: src/misc.c:1336
+#: src/misc.c:1381
 msgid "Playlist Options"
 msgstr "播放列表选项"
 
-#: src/misc.c:1342
+#: src/misc.c:1387
 msgid "Include only the selected files"
 msgstr "仅包含已选择的文件"
 
-#: src/misc.c:1345
+#: src/misc.c:1390
 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:1352
+#: src/misc.c:1397
 msgid "Use full path for files in playlist"
 msgstr ""
 
-#: src/misc.c:1355
+#: src/misc.c:1400
 msgid "Use relative path for files in playlist"
 msgstr ""
 
 #. Create playlist in parent directory
-#: src/misc.c:1365
+#: src/misc.c:1410
 msgid "Create playlist in the parent directory"
 msgstr ""
 
-#: src/misc.c:1368
+#: src/misc.c:1413
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 
 #. DOS Separator
-#: src/misc.c:1372
+#: src/misc.c:1417
 msgid "Use DOS directory separator"
 msgstr "使用 DOS 目录分隔符"
 
-#: src/misc.c:1377
+#: src/misc.c:1422
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 
-#: src/misc.c:1386
+#: src/misc.c:1431
 msgid "Playlist Content"
 msgstr "播放列表内容"
 
-#: src/misc.c:1392
+#: src/misc.c:1437
 msgid "Write only list of files"
 msgstr ""
 
-#: src/misc.c:1396
+#: src/misc.c:1441
 msgid "Write info using filename"
 msgstr ""
 
-#: src/misc.c:1399
+#: src/misc.c:1444
 msgid "Write info using :"
 msgstr ""
 
-#: src/misc.c:1658
+#: src/misc.c:1704
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
 "Overwrite?"
 msgstr ""
 
-#: src/misc.c:1659
+#: src/misc.c:1705
 msgid "Write Playlist..."
 msgstr "写入播放列表..."
 
 #. Writing fails...
-#: src/misc.c:1673
+#: src/misc.c:1719
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
 "(%s)"
 msgstr ""
 
-#: src/misc.c:1680
+#: src/misc.c:1726
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr ""
 
-#: src/misc.c:1916
+#: src/misc.c:1962
 msgid "CD"
 msgstr "光盘"
 
-#: src/misc.c:1918
+#: src/misc.c:1964
 msgid "Track"
 msgstr "音轨"
 
-#: src/misc.c:1920
-msgid "Comment"
-msgstr "备注"
-
-#: src/misc.c:1921 src/picture.c:820
+#: src/misc.c:1967 src/picture.c:821
 msgid "Composer"
 msgstr "作曲"
 
-#: src/misc.c:1922
+#: src/misc.c:1968
 msgid "Orig. Artist"
 msgstr "原始艺术家"
 
-#: src/misc.c:1923
+#: src/misc.c:1969
 msgid "Copyright"
 msgstr "版权所有"
 
-#: src/misc.c:1924
+#: src/misc.c:1970
 msgid "URL"
 msgstr ""
 
-#: src/misc.c:1925
+#: src/misc.c:1971
 msgid "Encoded by"
 msgstr "使用的编码器"
 
-#: src/misc.c:1936
+#: src/misc.c:1982
 msgid "Search a file"
 msgstr "搜索文件"
 
-#: src/misc.c:1976
+#: src/misc.c:2022
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 
 #. Where...
-#: src/misc.c:1982
+#: src/misc.c:2028
 msgid "In :"
 msgstr "在："
 
-#: src/misc.c:1985
+#: src/misc.c:2031
 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:1987
+#: src/misc.c:2033
 msgid "the Tag"
 msgstr "标签"
 
 #. Property of the search
-#: src/misc.c:1997 src/prefs.c:323
+#: src/misc.c:2043 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "区分大小写"
 
-#: src/misc.c:2430
+#: src/misc.c:2476
 #, c-format
 msgid "Found : %d file(s)"
 msgstr ""
 
-#: src/misc.c:2692
+#: src/misc.c:2739
 msgid "Load the filenames from a TXT file"
 msgstr "从文本文件中载入文件名"
 
-#: src/misc.c:2722
+#: src/misc.c:2769
 msgid "File :"
 msgstr "文件："
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2740
+#: src/misc.c:2787
 msgid " Load "
 msgstr " 装载 "
 
-#. Label of file content
-#: src/misc.c:2752
-msgid "Loaded File Content :"
-msgstr ""
+#: src/misc.c:2810
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "重命名文件时确认"
 
-#. Label of current list
-#: src/misc.c:2778
-msgid "Files Name List :"
-msgstr ""
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2831 src/misc.c:2925
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "插入空白行"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2840 src/misc.c:2934
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "删除此行"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+msgid "Delete all blank lines"
+msgstr "删除所有空白行"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2861 src/misc.c:2955
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "仅包含已选择的文件"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2870 src/misc.c:2964
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "仅包含已选择的文件"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+msgid "Reload"
+msgstr "重新载入"
+
+#: src/misc.c:2903
+#, fuzzy
+msgid "List of files"
+msgstr "最后的文件"
+
+#: src/misc.c:2998
+#, fuzzy
+msgid "Selected line:"
+msgstr "选择所有行"
 
-#: src/misc.c:2828
+#: src/misc.c:3016
 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:3212
+#: src/misc.c:3403
 msgid "Insert a blank line"
 msgstr "插入空白行"
 
-#: src/misc.c:3218
+#: src/misc.c:3409
 msgid "Delete this line"
 msgstr "删除此行"
 
-#: src/misc.c:3224
-msgid "Delete all blank lines"
-msgstr "删除所有空白行"
+#: src/misc.c:3424
+#, fuzzy
+msgid "Move up this line"
+msgstr "上移此掩码"
 
-#: src/misc.c:3233
-msgid "Reload"
-msgstr "重新载入"
+#: src/misc.c:3430
+#, fuzzy
+msgid "Move down this line"
+msgstr "下移此掩码"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3008,121 +3074,121 @@ msgstr ""
 msgid "Save file..."
 msgstr "保存文件..."
 
-#: src/picture.c:785
+#: src/picture.c:786
 msgid "JPEG image"
 msgstr "JPEG 图像"
 
-#: src/picture.c:787
+#: src/picture.c:788
 msgid "PNG image"
 msgstr "PNG 图像"
 
-#: src/picture.c:789
+#: src/picture.c:790
 msgid "Unknown image"
 msgstr "未知图像"
 
-#: src/picture.c:800
+#: src/picture.c:801
 msgid "32x32 pixel PNG file icon"
 msgstr ""
 
-#: src/picture.c:802
+#: src/picture.c:803
 msgid "Other file icon"
 msgstr ""
 
-#: src/picture.c:804
+#: src/picture.c:805
 msgid "Cover (front)"
 msgstr ""
 
-#: src/picture.c:806
+#: src/picture.c:807
 msgid "Cover (back)"
 msgstr ""
 
-#: src/picture.c:808
+#: src/picture.c:809
 msgid "Leaflet page"
 msgstr ""
 
-#: src/picture.c:810
+#: src/picture.c:811
 msgid "Media (e.g. label side of CD)"
 msgstr ""
 
-#: src/picture.c:812
+#: src/picture.c:813
 msgid "Lead artist/lead performer/soloist"
 msgstr ""
 
-#: src/picture.c:814
+#: src/picture.c:815
 msgid "Artist/performer"
 msgstr "艺术家 / 表演者"
 
-#: src/picture.c:816
+#: src/picture.c:817
 msgid "Conductor"
 msgstr "指挥"
 
-#: src/picture.c:818
+#: src/picture.c:819
 msgid "Band/Orchestra"
 msgstr "乐队"
 
-#: src/picture.c:822
+#: src/picture.c:823
 msgid "Lyricist/text writer"
 msgstr ""
 
-#: src/picture.c:824
+#: src/picture.c:825
 msgid "Recording location"
 msgstr ""
 
-#: src/picture.c:826
+#: src/picture.c:827
 msgid "During recording"
 msgstr ""
 
-#: src/picture.c:828
+#: src/picture.c:829
 msgid "During performance"
 msgstr ""
 
-#: src/picture.c:830
+#: src/picture.c:831
 msgid "Movie/video screen capture"
 msgstr ""
 
-#: src/picture.c:832
+#: src/picture.c:833
 msgid "A bright coloured fish"
 msgstr ""
 
-#: src/picture.c:834
+#: src/picture.c:835
 msgid "Illustration"
 msgstr ""
 
-#: src/picture.c:836
+#: src/picture.c:837
 msgid "Band/Artist logotype"
 msgstr ""
 
-#: src/picture.c:838
+#: src/picture.c:839
 msgid "Publisher/studio logotype"
 msgstr ""
 
-#: src/picture.c:840
+#: src/picture.c:841
 msgid "Unknown picture type"
 msgstr ""
 
-#: src/picture.c:868 src/picture.c:879
+#: src/picture.c:869 src/picture.c:880
 msgid "pixels"
 msgstr "像素"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:870 src/picture.c:881
 msgid "Type"
 msgstr "类型"
 
-#: src/picture.c:881
+#: src/picture.c:882
 msgid "Description"
 msgstr "描述"
 
-#: src/picture.c:983
+#: src/picture.c:984
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
 msgstr ""
 
-#: src/picture.c:986
+#: src/picture.c:987
 msgid "Loading Picture File..."
 msgstr "载入图片文件..."
 
-#: src/picture.c:1080
+#: src/picture.c:1081
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3133,7 +3199,7 @@ msgstr ""
 "“%s”！\n"
 "(%s)"
 
-#: src/picture.c:1088
+#: src/picture.c:1089
 msgid "Picture file not loaded..."
 msgstr ""
 
@@ -3376,23 +3442,49 @@ msgid ""
 "the program (as 'xmms -p') before to receive files as other arguments."
 msgstr ""
 
+#. Log options
+#: src/prefs.c:411
+#, fuzzy
+msgid "Log Options"
+msgstr "标签选项"
+
+#. Show / hide log view
+#: src/prefs.c:418
+#, fuzzy
+msgid "Show log view in main window"
+msgstr "屏幕居中"
+
+#: src/prefs.c:421
+msgid "If activated, the log view would be visible in the main window."
+msgstr ""
+
+#: src/prefs.c:428
+msgid "Max number of lines :"
+msgstr ""
+
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+#. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+#. "to receive files as other arguments."),NULL);
+#.
 #.
 #. * File Settings
 #.
-#: src/prefs.c:415 src/prefs.c:416
+#: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
 msgstr "文件设置"
 
 #. File (name) Options
-#: src/prefs.c:426
+#: src/prefs.c:458
 msgid "File Options"
 msgstr "文件选项"
 
-#: src/prefs.c:432
+#: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr "替换文件名中的非法字符 (为 Windows 和 CD-ROM)"
 
-#: src/prefs.c:435
+#: src/prefs.c:467
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3401,52 +3493,52 @@ msgid ""
 msgstr ""
 
 #. Extension case (lower/upper?)
-#: src/prefs.c:444
+#: src/prefs.c:476
 msgid "Convert filename extension to :"
 msgstr "将文件后缀转换为："
 
-#: src/prefs.c:447
+#: src/prefs.c:479
 msgid "Lower Case"
 msgstr "小写"
 
-#: src/prefs.c:450
+#: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr ""
 
-#: src/prefs.c:453
+#: src/prefs.c:485
 msgid "Upper Case"
 msgstr "大写"
 
-#: src/prefs.c:456
+#: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr ""
 
-#: src/prefs.c:459
+#: src/prefs.c:491
 msgid "No Change"
 msgstr "不变"
 
-#: src/prefs.c:462
+#: src/prefs.c:494
 msgid "The extension will not be converted"
 msgstr ""
 
 #. Preserve modification time
-#: src/prefs.c:465
+#: src/prefs.c:497
 msgid "Preserve modification time of the file"
 msgstr ""
 
-#: src/prefs.c:468
+#: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
 
 #. Change directory modification time
-#: src/prefs.c:472
+#: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: src/prefs.c:476
+#: src/prefs.c:508
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3457,47 +3549,47 @@ msgid ""
 msgstr ""
 
 #. Character Set for File Name
-#: src/prefs.c:484
+#: src/prefs.c:516
 msgid "Character Set for File Name"
 msgstr ""
 
 #. Rules for character set
-#: src/prefs.c:500
+#: src/prefs.c:532
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
 msgstr ""
 
-#: src/prefs.c:508
+#: src/prefs.c:540
 msgid "Try an other character encoding"
 msgstr "尝试其他字符编码"
 
-#: src/prefs.c:512
+#: src/prefs.c:544
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "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 ""
 
-#: src/prefs.c:519
+#: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:522 src/prefs.c:798 src/prefs.c:864
+#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
 "looking characters."
 msgstr ""
 
-#: src/prefs.c:528
+#: src/prefs.c:560
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
 
-#: src/prefs.c:531 src/prefs.c:807 src/prefs.c:873
+#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3506,42 +3598,42 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: src/prefs.c:540 src/prefs.c:541
+#: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
 msgstr "标签设置"
 
 #. Tag Options
-#: src/prefs.c:550
+#: src/prefs.c:582
 msgid "Tag Options"
 msgstr "标签选项"
 
-#: src/prefs.c:556
+#: src/prefs.c:588
 msgid "Auto completion of date if not complete"
 msgstr "自动补全日期"
 
-#: src/prefs.c:559
+#: src/prefs.c:591
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
 "1996, 95 => 1995, ...)."
 msgstr ""
 
-#: src/prefs.c:566
+#: src/prefs.c:598
 msgid "Write the track field with the following number of digits :"
 msgstr "写入音轨列，使用后面的数字："
 
-#: src/prefs.c:569
+#: src/prefs.c:601
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
 "'10',...). Else it keeps the 'raw' track value."
 msgstr ""
 
-#: src/prefs.c:584
+#: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
 msgstr ""
 
-#: src/prefs.c:587
+#: src/prefs.c:619
 msgid ""
 "XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
 "files as other apps do. In fact, this field is usually labeled with "
@@ -3550,17 +3642,17 @@ msgid ""
 "shown in XMMS, though."
 msgstr ""
 
-#: src/prefs.c:602
+#: src/prefs.c:634
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr ""
 
-#: src/prefs.c:611
+#: src/prefs.c:643
 msgid "Keep focus to the same tag field"
 msgstr ""
 
-#: src/prefs.c:617
+#: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
 msgstr ""
 
@@ -3568,33 +3660,33 @@ msgstr ""
 #.
 #. * ID3 Tag Settings
 #.
-#: src/prefs.c:625 src/prefs.c:626
+#: src/prefs.c:657 src/prefs.c:658
 #, fuzzy
 msgid "ID3 Tag Settings"
 msgstr "标签设置"
 
 #. Tag Rules frame
-#: src/prefs.c:638
+#: src/prefs.c:670
 msgid "ID3 Tag Rules"
 msgstr "ID3 标签规则"
 
 #. Write ID3 tags in FLAC files
-#: src/prefs.c:650
+#: src/prefs.c:682
 msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 msgstr ""
 
-#: src/prefs.c:653
+#: src/prefs.c:685
 msgid ""
 "If activated, ID3 tags will be also added in the FLAC file (according the "
 "two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
 msgstr ""
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: src/prefs.c:658
+#: src/prefs.c:690
 msgid "Strip tags if all fields are set to blank"
 msgstr "如果所有列都为空则去除标签"
 
-#: src/prefs.c:661
+#: src/prefs.c:693
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached picture, lyrics, ...), this option allows "
@@ -3603,65 +3695,65 @@ msgid ""
 msgstr ""
 
 #. Convert old ID3v2 tag version
-#: src/prefs.c:667
+#: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr "自动转换旧的 ID3v2 标签版本"
 
-#: src/prefs.c:670
+#: src/prefs.c:702
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
 msgstr "如果激活，则老的 ID3v2 标签版本(ID3v2.2) 将被升级为 ID3v2.3 版本。"
 
 #. Use CRC32
-#: src/prefs.c:674
+#: src/prefs.c:706
 msgid "Use CRC32"
 msgstr ""
 
-#: src/prefs.c:677
+#: src/prefs.c:709
 #, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr "写入 ID3v2 标签"
 
 #. Use Compression
-#: src/prefs.c:680
+#: src/prefs.c:712
 msgid "Use Compression"
 msgstr ""
 
-#: src/prefs.c:683
+#: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: src/prefs.c:686
+#: src/prefs.c:718
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "ID3 标签字符集"
 
 #. ID3v2 tags
-#: src/prefs.c:693
+#: src/prefs.c:725
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "写入 ID3v2 标签"
 
 #. Write ID3v2 tag
-#: src/prefs.c:706
+#: src/prefs.c:738
 msgid "Write ID3v2 tag"
 msgstr "写入 ID3v2 标签"
 
-#: src/prefs.c:709
+#: src/prefs.c:741
 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:716
+#: src/prefs.c:748
 #, fuzzy
 msgid "Version:"
 msgstr "描述："
 
-#: src/prefs.c:723
+#: src/prefs.c:755
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3670,77 +3762,77 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:737 src/prefs.c:835
+#: src/prefs.c:769 src/prefs.c:867
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:745
+#: src/prefs.c:777
 #, fuzzy
 msgid "Unicode "
 msgstr "使用的编码器"
 
-#: src/prefs.c:753
+#: src/prefs.c:785
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "使用的编码器"
 
-#: src/prefs.c:776
+#: src/prefs.c:808
 msgid "Character set used to write the tag data in the file."
 msgstr "将标签写入文件时使用的字符集。"
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:786 src/prefs.c:851
+#: src/prefs.c:818 src/prefs.c:883
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:790 src/prefs.c:856
+#: src/prefs.c:822 src/prefs.c:888
 #, fuzzy
 msgid "No"
 msgstr " 否 "
 
-#: src/prefs.c:795 src/prefs.c:861
+#: src/prefs.c:827 src/prefs.c:893
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:804 src/prefs.c:870
+#: src/prefs.c:836 src/prefs.c:902
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:812
+#: src/prefs.c:844
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ID3 标签"
 
 #. Write ID3v1 tag
-#: src/prefs.c:826
+#: src/prefs.c:858
 msgid "Write ID3v1.x tag"
 msgstr "写入 ID3v1.x 标签"
 
-#: src/prefs.c:829
+#: src/prefs.c:861
 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:846
+#: src/prefs.c:878
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "将标签写入文件时使用的字符集。"
 
 #. Character Set for reading tag
-#: src/prefs.c:878
+#: src/prefs.c:910
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "ID3 标签字符集"
 
-#: src/prefs.c:891
+#: src/prefs.c:924
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:896
+#: src/prefs.c:929
 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 "
@@ -3757,59 +3849,59 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:914
+#: src/prefs.c:947
 msgid "Character set used to read tag data in the file."
 msgstr "从文件中读取标签时使用的字符集"
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:929 src/prefs.c:930
+#: src/prefs.c:962 src/prefs.c:963
 msgid "Scanner"
 msgstr "扫描器"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:942
+#: src/prefs.c:975
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "填充标签扫描器 - 字符转换"
 
-#: src/prefs.c:948 src/prefs.c:974
+#: src/prefs.c:981 src/prefs.c:1007
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "转换下划线 “_” 和字符串 “%20” 为空格 “ ”"
 
-#: src/prefs.c:950 src/prefs.c:976
+#: src/prefs.c:983 src/prefs.c:1009
 msgid "Convert space ' ' to underscore '_'"
 msgstr "转换空格 “ ” 为下划线 “_”"
 
-#: src/prefs.c:962 src/prefs.c:964
+#: src/prefs.c:995 src/prefs.c:997
 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:968
+#: src/prefs.c:1001
 msgid "Rename File Scanner - Character Conversion"
 msgstr "重命名文件扫描器 - 字符转换"
 
-#: src/prefs.c:988 src/prefs.c:990
+#: src/prefs.c:1021 src/prefs.c:1023
 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:994
+#: src/prefs.c:1027
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "列扫描器 - 字符转换"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1001
+#: src/prefs.c:1034
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1005
+#: src/prefs.c:1038
 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 "
@@ -3818,62 +3910,62 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1011
+#: src/prefs.c:1044
 msgid "Scanner Window"
 msgstr "扫描器窗口"
 
-#: src/prefs.c:1017
+#: src/prefs.c:1050
 msgid "Open the Scanner Window on startup"
 msgstr "启动时打开扫描器窗口"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1053
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr ""
 
-#: src/prefs.c:1023
+#: src/prefs.c:1056
 msgid "Scanner window always on top"
 msgstr "扫描器窗口置顶"
 
-#: src/prefs.c:1026
+#: src/prefs.c:1059
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
 msgstr ""
 
 #. Other options
-#: src/prefs.c:1031
+#: src/prefs.c:1064
 msgid "Fields"
 msgstr ""
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1038
+#: src/prefs.c:1071
 msgid "Overwrite fields when scanning tag"
 msgstr "扫描标签时覆盖列"
 
-#: src/prefs.c:1041
+#: src/prefs.c:1074
 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:1052
+#: src/prefs.c:1085
 msgid "Set this text as default comment :"
 msgstr "将此文本作为默认备注："
 
-#: src/prefs.c:1055
+#: src/prefs.c:1088
 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:1072
+#: src/prefs.c:1105
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "使用 CRC32 作为默认备注 (只限用 ID3 标签的文件)。"
 
-#: src/prefs.c:1076
+#: src/prefs.c:1109
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -3882,46 +3974,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1087 src/prefs.c:1088
+#: src/prefs.c:1120 src/prefs.c:1121
 msgid "CD Data Base"
 msgstr "CD 数据库"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1097
+#: src/prefs.c:1130
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "自动搜索"
 
-#: src/prefs.c:1106 src/prefs.c:1145 src/prefs.c:1179
+#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
 msgid "Name :"
 msgstr "名称："
 
-#: src/prefs.c:1125 src/prefs.c:1153 src/prefs.c:1188 src/prefs.c:1276
+#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
 msgid "Port :"
 msgstr "端口："
 
-#: src/prefs.c:1135 src/prefs.c:1163 src/prefs.c:1198
+#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
 msgid "CGI Path :"
 msgstr "CGI 路径："
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1171
+#: src/prefs.c:1204
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "服务器设置"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1206
+#: src/prefs.c:1239
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "CD 数据库"
 
-#: src/prefs.c:1214
+#: src/prefs.c:1247
 #, fuzzy
 msgid "Path :"
 msgstr "CGI 路径："
 
-#: src/prefs.c:1225
+#: src/prefs.c:1258
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -3930,65 +4022,65 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1251
+#: src/prefs.c:1284
 msgid "Proxy Settings"
 msgstr "代理服务器设置"
 
-#: src/prefs.c:1260
+#: src/prefs.c:1293
 msgid "Use a proxy"
 msgstr "使用代理服务器"
 
-#: src/prefs.c:1263
+#: src/prefs.c:1296
 msgid "Set active the settings of the proxy server."
 msgstr ""
 
-#: src/prefs.c:1268
+#: src/prefs.c:1301
 msgid "Host Name :"
 msgstr "主机名："
 
-#: src/prefs.c:1275
+#: src/prefs.c:1308
 msgid "Name of the proxy server."
 msgstr "代理服务器的名称。"
 
-#: src/prefs.c:1283
+#: src/prefs.c:1316
 msgid "Port of the proxy server."
 msgstr "代理服务器的端口。"
 
-#: src/prefs.c:1288
+#: src/prefs.c:1321
 msgid "User Name :"
 msgstr "用户名："
 
-#: src/prefs.c:1295
+#: src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr "代理服务器的用户名。"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1329
 msgid "User Password :"
 msgstr "用户密码："
 
-#: src/prefs.c:1304
+#: src/prefs.c:1337
 msgid "Password of user for the the proxy server."
 msgstr "代理服务器用户的密码"
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1309
+#: src/prefs.c:1342
 msgid "Track Name List"
 msgstr "音轨名列表"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: src/prefs.c:1320
+#: src/prefs.c:1353
 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:1325
+#: src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -3997,67 +4089,71 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1340 src/prefs.c:1341
+#: src/prefs.c:1373 src/prefs.c:1374
 msgid "Confirmation"
 msgstr "确认"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1382
 msgid "Confirm exit from program"
 msgstr "确定从程序中退出"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1385
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr ""
 
-#: src/prefs.c:1355
+#: src/prefs.c:1388
 msgid "Confirm writing of file tag"
 msgstr "为文件写入标签时确认"
 
-#: src/prefs.c:1359
+#: src/prefs.c:1392
 msgid "Confirm renaming of file"
 msgstr "重命名文件时确认"
 
-#: src/prefs.c:1363
+#: src/prefs.c:1396
 msgid "Confirm deleting of file"
 msgstr "删除文件时确认"
 
-#: src/prefs.c:1367
+#: src/prefs.c:1400
 msgid "Confirm writing of playlist"
 msgstr "写入播放列表时确认"
 
-#: src/prefs.c:1389
+#. 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:1422
 msgid "Apply changes (but don't save) and close this window"
 msgstr "应用变更(但不保存)并关闭此窗口"
 
-#: src/prefs.c:1398
+#: src/prefs.c:1431
 msgid "Close this window without saving"
 msgstr "不保存关闭此窗口"
 
-#: src/prefs.c:1406
+#: src/prefs.c:1439
 msgid "Save changes and close this window"
 msgstr "保存并关闭此窗口"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1439
+#: src/prefs.c:1472
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
-#: src/prefs.c:1585
+#: src/prefs.c:1618
 msgid "Changes applied"
 msgstr "变更已应用"
 
-#: src/prefs.c:1604 src/setting.c:854
+#: src/prefs.c:1637 src/setting.c:868
 msgid "Configuration saved"
 msgstr "配置已保存"
 
-#: src/prefs.c:1611
+#: src/prefs.c:1644
 msgid "Configuration unchanged"
 msgstr "配置未改变"
 
-#: src/prefs.c:1703
+#: src/prefs.c:1736
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4065,11 +4161,11 @@ msgid ""
 "(%s) "
 msgstr ""
 
-#: src/prefs.c:1705
+#: src/prefs.c:1738
 msgid "Not a directory"
 msgstr "不是一个目录"
 
-#: src/prefs.c:1806
+#: src/prefs.c:1839
 #, fuzzy, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "程序 “%s” 无法被找到！"
@@ -4086,36 +4182,36 @@ msgstr "重命名文件和目录"
 msgid "Process Fields"
 msgstr "处理列"
 
-#: src/scan.c:350
+#: src/scan.c:353
 msgid "Tag successfully scanned..."
 msgstr "标签成功被扫描"
 
-#: src/scan.c:352
+#: src/scan.c:355
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "标签成功被扫描...(%s)"
 
-#: src/scan.c:392
+#: src/scan.c:395
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:474 src/scan.c:503
+#: src/scan.c:477 src/scan.c:506
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "扫描错误：无法找到分隔符 “%s” 在 “%s” 中"
 
-#: src/scan.c:660
+#: src/scan.c:663
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 
-#: src/scan.c:683
+#: src/scan.c:686
 msgid "New file name successfully scanned..."
 msgstr "新文件名成功被扫描..."
 
-#: src/scan.c:686
+#: src/scan.c:689
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "新文件名成功被扫描...(%s)"
@@ -4123,57 +4219,57 @@ 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:1801
+#: src/scan.c:1909
 msgid "Tag and File Name scan"
 msgstr "标签与文件名扫描"
 
 #. Option Menu
-#: src/scan.c:1823
+#: src/scan.c:1931
 #, fuzzy
 msgid "Scanner:"
 msgstr "扫描器："
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1842
+#: src/scan.c:1953
 msgid "Select the type of scanner to use"
 msgstr "选择扫描方式"
 
-#: src/scan.c:1851
+#: src/scan.c:1962
 msgid "Open scanner window / Scan selected files"
 msgstr "打开扫描器窗口 / 扫描选择的文件"
 
-#: src/scan.c:1864
+#: src/scan.c:1975
 msgid "Scanner Options"
 msgstr "扫描器选项"
 
-#: src/scan.c:1873
+#: src/scan.c:1984
 msgid "Show / Hide Masks Editor"
 msgstr "显示 / 隐藏掩码编辑器"
 
-#: src/scan.c:1883
+#: src/scan.c:1994
 msgid "Show / Hide Legend"
 msgstr "显示 / 隐藏图示"
 
-#: src/scan.c:1893
+#: src/scan.c:2004
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: src/scan.c:1921
+#: src/scan.c:2032
 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:1947
+#: src/scan.c:2058
 msgid "Fill tag preview..."
 msgstr "填充标签预览..."
 
-#: src/scan.c:1974
+#: src/scan.c:2085
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:1987
+#: src/scan.c:2098
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4182,203 +4278,204 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2014
+#: src/scan.c:2125
 msgid "Rename file preview..."
 msgstr "重命名文件预览..."
 
-#: src/scan.c:2034
+#: src/scan.c:2145
 msgid "Select fields:"
 msgstr "选择列："
 
-#: src/scan.c:2037
+#: src/scan.c:2148
 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:2040
+#: src/scan.c:2151
 msgid "F"
 msgstr ""
 
-#: src/scan.c:2041
+#: src/scan.c:2152
 msgid "Process file name field"
 msgstr "处理文件名列"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2043
+#: src/scan.c:2154
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2044
+#: src/scan.c:2155
 msgid "Process title field"
 msgstr "处理标题列"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2046
+#: src/scan.c:2157
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2047
+#: src/scan.c:2158
 msgid "Process file artist field"
 msgstr "处理艺术家列"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2049
+#: src/scan.c:2160
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2050
+#: src/scan.c:2161
 msgid "Process album field"
 msgstr "处理专辑列"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2052
+#: src/scan.c:2163
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2053
+#: src/scan.c:2164
 msgid "Process genre field"
 msgstr "处理流派列"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2055
+#: src/scan.c:2166
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2056
+#: src/scan.c:2167
 msgid "Process comment field"
 msgstr "处理备注列"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2058
+#: src/scan.c:2169
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2059
+#: src/scan.c:2170
 msgid "Process composer field"
 msgstr "处理作曲家列"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2061
+#: src/scan.c:2172
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2062
+#: src/scan.c:2173
 msgid "Process original artist field"
 msgstr "处理原始艺术家列"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2064
+#: src/scan.c:2175
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2065
+#: src/scan.c:2176
 msgid "Process copyright field"
 msgstr "处理版权列"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2067
+#: src/scan.c:2178
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2068
+#: src/scan.c:2179
 msgid "Process URL field"
 msgstr "处理 URL 列"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2070
+#: src/scan.c:2181
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2071
+#: src/scan.c:2182
 msgid "Process encoder name field"
 msgstr "处理名称列"
 
-#: src/scan.c:2117
+#: src/scan.c:2228
 msgid "Invert Selection"
 msgstr "反向选择"
 
-#: src/scan.c:2126
+#: src/scan.c:2237
 msgid "Select/Unselect All."
 msgstr "全选 / 全不选"
 
 #. Group: character conversion
-#: src/scan.c:2133
+#: src/scan.c:2244
 msgid "Convert '_' and '%20' to ' '"
 msgstr "转换 “_” 和 “%20” 为 “ ”"
 
-#: src/scan.c:2138
+#: src/scan.c:2250
 #, fuzzy
 msgid "Convert:"
 msgstr "转换："
 
-#: src/scan.c:2140
+#: src/scan.c:2252
 #, fuzzy
 msgid "to: "
 msgstr "为："
 
-#: src/scan.c:2166
+#: src/scan.c:2281
 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:2169
+#: src/scan.c:2284
 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:2171
-msgid "Replace a character by an other one."
+#: src/scan.c:2287
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2203
+#: src/scan.c:2319
 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:2206
+#: src/scan.c:2322
 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:2209
+#: src/scan.c:2325
 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:2212
+#: src/scan.c:2328
 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:2221
+#: src/scan.c:2337
 msgid "Insert a space before an uppercase letter"
 msgstr ""
 
-#: src/scan.c:2222
+#: src/scan.c:2338
 msgid "Remove duplicates of space or underscore"
 msgstr ""
 
-#: src/scan.c:2240
+#: src/scan.c:2356
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 
-#: src/scan.c:2243
+#: src/scan.c:2359
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2246
+#: src/scan.c:2362
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4387,187 +4484,187 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2252
+#: src/scan.c:2368
 msgid "Legend"
 msgstr "图示"
 
-#: src/scan.c:2258
+#: src/scan.c:2374
 #, c-format
 msgid "%a : artist"
 msgstr "%a ：艺术家"
 
-#: src/scan.c:2261
+#: src/scan.c:2377
 msgid "%b : album"
 msgstr "%b ：专辑"
 
-#: src/scan.c:2264
+#: src/scan.c:2380
 #, c-format
 msgid "%c : comment"
 msgstr "%c ：备注"
 
-#: src/scan.c:2267
+#: src/scan.c:2383
 #, c-format
 msgid "%p : composer"
 msgstr "%p ：作曲"
 
-#: src/scan.c:2270
+#: src/scan.c:2386
 msgid "%r : copyright"
 msgstr "%r ：版权"
 
-#: src/scan.c:2273
+#: src/scan.c:2389
 #, c-format
 msgid "%d : disc number"
 msgstr ""
 
-#: src/scan.c:2276
+#: src/scan.c:2392
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e ：编码器"
 
-#: src/scan.c:2279
+#: src/scan.c:2395
 #, c-format
 msgid "%g : genre"
 msgstr "%g ：流派"
 
-#: src/scan.c:2282
+#: src/scan.c:2398
 #, c-format
 msgid "%i : ignored"
 msgstr "%i ：忽略"
 
-#: src/scan.c:2285
+#: src/scan.c:2401
 msgid "%l : number of tracks"
 msgstr "%l ：音轨号"
 
-#: src/scan.c:2288
+#: src/scan.c:2404
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o ：原始艺术家"
 
-#: src/scan.c:2291
+#: src/scan.c:2407
 #, c-format
 msgid "%n : track"
 msgstr "%n ：音轨"
 
-#: src/scan.c:2294
+#: src/scan.c:2410
 msgid "%t : title"
 msgstr "%t ：标题"
 
-#: src/scan.c:2297
+#: src/scan.c:2413
 #, c-format
 msgid "%u : URL"
 msgstr "%u ： URL"
 
-#: src/scan.c:2300
+#: src/scan.c:2416
 msgid "%y : year"
 msgstr "%y ：年份"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2307
+#: src/scan.c:2423
 msgid "Mask Editor"
 msgstr "掩码编辑器"
 
-#: src/scan.c:2364
+#: src/scan.c:2480
 msgid "Create New Mask"
 msgstr "创建新掩码"
 
-#: src/scan.c:2374
+#: src/scan.c:2490
 msgid "Move Up this Mask"
 msgstr "上移此掩码"
 
-#: src/scan.c:2384
+#: src/scan.c:2500
 msgid "Move Down this Mask"
 msgstr "下移此掩码"
 
-#: src/scan.c:2394
+#: src/scan.c:2510
 msgid "Duplicate Mask"
 msgstr "复制掩码"
 
-#: src/scan.c:2404
+#: src/scan.c:2520
 msgid "Add Default Masks"
 msgstr "添加默认掩码"
 
-#: src/scan.c:2414
+#: src/scan.c:2530
 msgid "Remove Mask"
 msgstr "删除掩码"
 
-#: src/scan.c:2424
+#: src/scan.c:2540
 msgid "Save Masks"
 msgstr "保存掩码"
 
-#: src/scan.c:2994
+#: src/scan.c:3117
 msgid "New_mask"
 msgstr "新掩码(_M)"
 
-#: src/scan.c:3032
+#: src/scan.c:3155
 msgid "Copy: No row selected!"
 msgstr ""
 
-#: src/scan.c:3131
+#: src/scan.c:3259
 msgid "Remove: No row selected!"
 msgstr ""
 
-#: src/scan.c:3178
+#: src/scan.c:3306
 msgid "Move Up: No row selected!"
 msgstr ""
 
-#: src/scan.c:3229
+#: src/scan.c:3359
 msgid "Move Down: No row selected!"
 msgstr ""
 
-#: src/setting.c:875
+#: src/setting.c:889
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 "错误：无法写入配置文件：%s (%s)\n"
-""
+"\a"
 
-#: src/setting.c:1018 src/setting.c:1055
+#: src/setting.c:1032 src/setting.c:1069
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr ""
 
-#: src/setting.c:1019
+#: src/setting.c:1033
 msgid "Loading default configuration..."
 msgstr ""
 
-#: src/setting.c:1119 src/setting.c:1126 src/setting.c:1133 src/setting.c:1140
-#: src/setting.c:1147 src/setting.c:1154 src/setting.c:1161 src/setting.c:1168
-#: src/setting.c:1175 src/setting.c:1182 src/setting.c:1189 src/setting.c:1196
-#: src/setting.c:1203 src/setting.c:1210 src/setting.c:1217 src/setting.c:1224
-#: src/setting.c:1231
+#: src/setting.c:1133 src/setting.c:1140 src/setting.c:1147 src/setting.c:1154
+#: src/setting.c:1161 src/setting.c:1168 src/setting.c:1175 src/setting.c:1182
+#: src/setting.c:1189 src/setting.c:1196 src/setting.c:1203 src/setting.c:1210
+#: src/setting.c:1217 src/setting.c:1224 src/setting.c:1231 src/setting.c:1238
+#: src/setting.c:1245
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr ""
 
-#: src/setting.c:1264
+#: src/setting.c:1278
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
 "错误：无法写入配置文件：%s (%s)\n"
-""
+"\a"
 
 #. Fall back to defaults
-#: src/setting.c:1344
+#: src/setting.c:1358
 msgid "Loading default 'Fill Tag' masks..."
 msgstr ""
 
 #. Fall back to defaults
-#: src/setting.c:1372
+#: src/setting.c:1386
 msgid "Loading default 'Rename File' masks..."
 msgstr ""
 
 #. Fall back to defaults
-#: src/setting.c:1399
+#: src/setting.c:1413
 msgid "Loading default 'Rename Directory' masks..."
 msgstr ""
 
-#: src/setting.c:1592
+#: src/setting.c:1606
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 
-#: src/setting.c:1608
+#: src/setting.c:1622
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr ""
@@ -4650,6 +4747,27 @@ msgstr "运行音频播放器"
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "键入的目录非法：\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#, fuzzy
+#~ msgid "(case sensitive)"
+#~ msgstr "区分大小写"
+
+#, fuzzy
+#~ msgid "(MP3 file support enabled using: libid3tag %s)"
+#~ msgstr "(MP4/AAC 文件支持被禁止)"
+
+#, fuzzy
+#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
+#~ msgstr "(MP4/AAC 文件支持被禁止)"
+
 #, fuzzy
 #~ msgid "ID3V2 tag Version"
 #~ msgstr "标签设置"
@@ -4675,10 +4793,10 @@ msgstr ""
 #~ msgstr "什么都不做"
 
 #, fuzzy
-#~ msgid "ERROR while opening file: '%s' (%s)"
+#~ msgid "ERROR while opening file: '%s' (%s)\a"
 #~ msgstr ""
 #~ "打开文件 “%s” (%s) 时发生错误。\n"
-#~ ""
+#~ "\a"
 
 #~ msgid "Load on startup the directory"
 #~ msgstr "启动时装入目录"
diff --git a/src/Makefile.in b/src/Makefile.in
index ec0e58d..858e54f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -65,32 +61,34 @@ 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. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=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 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+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-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-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
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -128,8 +126,10 @@ 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@
@@ -143,11 +143,11 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
 OBJEXT = @OBJEXT@
 OGG_CFLAGS = @OGG_CFLAGS@
 OGG_LIBS = @OGG_LIBS@
@@ -175,17 +175,13 @@ VORBIS_LIBS = @VORBIS_LIBS@
 WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+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_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -197,28 +193,39 @@ 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@
 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_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = libmpg123 libapetag id3lib
 easytag_SOURCES = \
  about.c \
@@ -294,7 +301,6 @@ EXTRA_DIST = \
  win32/win_easytag.c
 
 easytag_LDADD = $(GTK_LIBS) libmpg123/libmpg123.a libapetag/libapetag.a  id3lib/libid3bugfix.a
-localedir = $(datadir)/locale
 PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE)
 INCLUDES = -DLOCALE=\"$(localedir)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\"
 all: all-recursive
@@ -332,7 +338,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -360,7 +366,7 @@ clean-binPROGRAMS:
 	done
 easytag$(EXEEXT): $(easytag_OBJECTS) $(easytag_DEPENDENCIES) 
 	@rm -f easytag$(EXEEXT)
-	$(LINK) $(easytag_LDFLAGS) $(easytag_OBJECTS) $(easytag_LDADD) $(LIBS)
+	$(LINK) $(easytag_OBJECTS) $(easytag_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -401,22 +407,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wavpack_tag.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -427,10 +433,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # 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,
@@ -462,8 +464,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -564,23 +565,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/win32
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -594,7 +593,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -602,6 +601,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -612,7 +613,7 @@ all-am: Makefile $(PROGRAMS)
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -646,7 +647,7 @@ distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -660,12 +661,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -686,24 +695,26 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
+.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-recursive distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+	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.
diff --git a/src/about.c b/src/about.c
index edaf3ab..f6efc08 100755..100644
--- a/src/about.c
+++ b/src/about.c
@@ -37,6 +37,7 @@
 #include "about.h"
 #include "easytag.h"
 #include "misc.h"
+#include "log.h"
 #include "msgbox.h"
 #include "charset.h"
 
@@ -54,6 +55,17 @@
  ****************/
 static GtkWidget *AboutWindow = NULL;
 
+enum
+{
+    // Columns for titles
+    EXTENSION_NAME = 0,
+    EXTENSION_STATUT,
+    EXTENSION_COMMENT,
+
+    EXTENSION_COLUMN_COUNT
+};
+
+
 
 /**************
  * Prototypes *
@@ -106,7 +118,7 @@ void Show_About_Window (void)
     GtkWidget *ScrollWindow;
     GtkWidget *TextView;
     GtkTextBuffer *TextBuffer;
-    GtkTextIter iter;
+    GtkTextIter textIter;
     GtkWidget *Button;
     GtkWidget *Logo;
     GdkPixmap *pixmap;
@@ -125,7 +137,6 @@ void Show_About_Window (void)
             "simple and nice GTK+ interface makes tagging easier under GNU/Linux."
             "");
 
-
     /* Translation contributions */
     gchar *translations_thanks_text [][2]= {
             {"    - Bastian Kleineidam ",           _("(German translation)")},
@@ -135,12 +146,12 @@ void Show_About_Window (void)
             {"    - Sergey Zhumatiy ",              _("(Russian translation)")},
             {"    - Andrey Astafiev ",              _("(Russian translation)")},
             {"    - Vincent van Adrighem ",         _("(Dutch translation)")},
-            {"    - Bj�rn Olievier ",               _("(Dutch translation)")},
+            {"    - Björn Olievier ",               _("(Dutch translation)")},
             {"    - Patrik Israelsson ",            _("(Swedish translation)")},
-            {"    - Anders Str�mer ",               _("(Swedish translation)")},
+            {"    - Anders Strömer ",               _("(Swedish translation)")},
             {"    - Szel Miklos ",                  _("(Hungarian translation)")},
             {"    - Nagy Boldizsar ",               _("(Hungarian translation)")},
-            {"    - M�sz�ros Csaba ",               _("(Hungarian translation)")},
+            {"    - Mészáros Csaba ",               _("(Hungarian translation)")},
             {"    - Cappelletti Lorenzo ",          _("(Italian translation)")},
             {"    - Costantino Ceoldo ",            _("(Italian translation)")},
             {"    - Takeshi Aihana ",               _("(Japanese translation)")},
@@ -159,6 +170,7 @@ void Show_About_Window (void)
             {"    - Luchezar P. Petkov ",           _("(Bulgarian translation)")},
             {"    - Yang Jinsong ",                 _("(Chinese translation)")},
             {"    - Yuval Hager ",                  _("(Hebrew translation)")},
+            {"    - Miloš Popović ",                _("(Serbian translation)")},
             {NULL,NULL}
             };
 
@@ -207,6 +219,16 @@ void Show_About_Window (void)
             "    - Pierre Dumuid\n"
             "";
 
+    GtkWidget *ExtensionList;
+    GtkListStore *ExtensionListModel;
+    GtkTreeViewColumn* column;
+    GtkCellRenderer* renderer;
+    gchar *ExtensionList_Titles[] = { N_("Extension Name"),
+                                      N_("Status"),
+                                      N_("Comment")
+                                    };
+    GtkTreeIter treeIter;
+    
 
     /* Check if already opened */
     if (AboutWindow)
@@ -272,56 +294,9 @@ void Show_About_Window (void)
     Label = gtk_label_new(temp);
     gtk_box_pack_start(GTK_BOX(VBox),Label,FALSE,TRUE,0);
 
-#ifdef ENABLE_MP3 // FIX ME : should separate gtk and id3lib
-    sprintf(temp,_("(using: GTK+ %d.%d.%d)"),GTK_MAJOR_VERSION,GTK_MINOR_VERSION,
-        GTK_MICRO_VERSION);
-    Label = gtk_label_new(temp);
-    gtk_box_pack_start(GTK_BOX(VBox),Label,FALSE,TRUE,0);
-#endif
-
-#ifdef ENABLE_MP3
-    sprintf(temp, _("(MP3 file support enabled using: libid3tag %s)"), ID3_VERSION);
-    Label = gtk_label_new(temp);
-    gtk_box_pack_start(GTK_BOX(VBox),Label,FALSE,TRUE,0);
-#if (defined ENABLE_ID3LIB) 
-    sprintf(temp, _("(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"),
-        ID3LIB_MAJOR_VERSION, ID3LIB_MINOR_VERSION, ID3LIB_PATCH_VERSION);
-    Label = gtk_label_new(temp);
-    gtk_box_pack_start(GTK_BOX(VBox),Label,FALSE,TRUE,0);
-#else
-    Label = gtk_label_new(_("(ID3v2.3 tags  support disabled)"));
-    gtk_box_pack_start(GTK_BOX(VBox),Label,FALSE,TRUE,0);
-#endif
-#else
-    sprintf(temp, _("(MP3 file support disabled)"));
+    sprintf(temp,_("(using: GTK+ %d.%d.%d)"),GTK_MAJOR_VERSION,GTK_MINOR_VERSION,GTK_MICRO_VERSION);
     Label = gtk_label_new(temp);
     gtk_box_pack_start(GTK_BOX(VBox),Label,FALSE,TRUE,0);
-#endif
-
-#ifndef ENABLE_OGG
-    Label = gtk_label_new(_("(Ogg Vorbis file support disabled)"));
-    gtk_box_pack_start(GTK_BOX(VBox),Label,FALSE,TRUE,0);
-#endif
-
-#ifndef ENABLE_SPEEX
-    Label = gtk_label_new(_("(Speex file support disabled)"));
-    gtk_box_pack_start(GTK_BOX(VBox),Label,FALSE,TRUE,0);
-#endif
-
-#ifndef ENABLE_FLAC
-    Label = gtk_label_new(_("(FLAC file support disabled)"));
-    gtk_box_pack_start(GTK_BOX(VBox),Label,FALSE,TRUE,0);
-#endif
-
-#ifndef ENABLE_MP4
-    Label = gtk_label_new(_("(MP4/AAC file support disabled)"));
-    gtk_box_pack_start(GTK_BOX(VBox),Label,FALSE,TRUE,0);
-#endif
-
-#ifndef ENABLE_WAVPACK
-    Label = gtk_label_new(_("(WavPack file support disabled)"));
-    gtk_box_pack_start(GTK_BOX(VBox),Label,FALSE,TRUE,0);
-#endif
 
     /* Insert a blank line */
     Label = gtk_label_new("");
@@ -341,6 +316,7 @@ void Show_About_Window (void)
     gtk_misc_set_alignment(GTK_MISC(Label),1,0.5);
     gtk_box_pack_start(GTK_BOX(hbox),Label,TRUE,TRUE,0);
     Button = gtk_button_new_with_label(WEBPAGE);
+    //Button = gtk_link_button_new(WEBPAGE);
     gtk_box_pack_start(GTK_BOX(hbox),Button,TRUE,TRUE,0);
     g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(About_Window_Go_To_Home_Page),NULL);
     gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
@@ -362,12 +338,141 @@ void Show_About_Window (void)
 
 
     /*
+     * Tab for extensions
+     */
+
+    Label = gtk_label_new(_("Extensions"));
+    Frame = gtk_frame_new(NULL);
+    gtk_notebook_append_page(GTK_NOTEBOOK(AboutNoteBook),Frame,Label);
+
+    ScrollWindow = gtk_scrolled_window_new(NULL,NULL);
+    gtk_container_add(GTK_CONTAINER(Frame),ScrollWindow);
+    gtk_container_set_border_width(GTK_CONTAINER(Frame),2);
+    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ScrollWindow),
+                                   GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
+
+    ExtensionListModel = gtk_list_store_new(EXTENSION_COLUMN_COUNT,
+                                            G_TYPE_STRING, /* Extension name */
+                                            G_TYPE_STRING, /* Statut */
+                                            G_TYPE_STRING  /* Comment */
+                                            );
+    ExtensionList = gtk_tree_view_new_with_model(GTK_TREE_MODEL(ExtensionListModel));
+
+    renderer = gtk_cell_renderer_text_new(); /* Extension name */
+    column = gtk_tree_view_column_new_with_attributes(_(ExtensionList_Titles[0]), renderer,
+                                                      "text", EXTENSION_NAME,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(ExtensionList), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Statut */
+    column = gtk_tree_view_column_new_with_attributes(_(ExtensionList_Titles[1]), renderer,
+                                                      "text", EXTENSION_STATUT,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(ExtensionList), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Comment */
+    column = gtk_tree_view_column_new_with_attributes(_(ExtensionList_Titles[2]), renderer,
+                                                      "text", EXTENSION_COMMENT,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(ExtensionList), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    gtk_container_add(GTK_CONTAINER(ScrollWindow),ExtensionList);
+    gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(ExtensionList)),
+            GTK_SELECTION_NONE);
+    gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(ExtensionList), FALSE);
+    
+    // Load extensions list
+    // MP3
+#ifdef ENABLE_MP3
+    sprintf(temp, _("libid3tag %s"), ID3_VERSION);
+#endif
+    gtk_list_store_append(ExtensionListModel, &treeIter);
+    gtk_list_store_set(ExtensionListModel, &treeIter,
+                       EXTENSION_NAME,      _("MP3 file support"),
+#ifdef ENABLE_MP3
+                       EXTENSION_STATUT,    _("enabled"),
+                       EXTENSION_COMMENT,   temp,
+#else
+                       EXTENSION_STATUT,    _("disabled"),
+#endif
+                       -1);
+#ifdef ENABLE_MP3
+#if (defined ENABLE_ID3LIB) 
+    sprintf(temp, _("id3lib %d.%d.%d"), ID3LIB_MAJOR_VERSION, ID3LIB_MINOR_VERSION, ID3LIB_PATCH_VERSION);
+#endif
+    gtk_list_store_append(ExtensionListModel, &treeIter);
+    gtk_list_store_set(ExtensionListModel, &treeIter,
+                       EXTENSION_NAME,      _("ID3v2.3 tags writting support"),
+#if (defined ENABLE_ID3LIB) 
+                       EXTENSION_STATUT,    _("available"), // May not be used
+                       EXTENSION_COMMENT,   temp,
+#else
+                       EXTENSION_STATUT,    _("disabled"),
+#endif
+                       -1);
+#endif
+    // Ogg Vorbis
+    gtk_list_store_append(ExtensionListModel, &treeIter);
+    gtk_list_store_set(ExtensionListModel, &treeIter,
+                       EXTENSION_NAME,      _("Ogg Vorbis file support"),
+#ifdef ENABLE_OGG
+                       EXTENSION_STATUT,    _("enabled"),
+#else
+                       EXTENSION_STATUT,    _("disabled"),
+#endif
+                       -1);
+    // Speex
+    gtk_list_store_append(ExtensionListModel, &treeIter);
+    gtk_list_store_set(ExtensionListModel, &treeIter,
+                       EXTENSION_NAME,      _("Speex file support"),
+#ifdef ENABLE_SPEEX
+                       EXTENSION_STATUT,    _("enabled"),
+#else
+                       EXTENSION_STATUT,    _("disabled"),
+#endif
+                       -1);
+    // FLAC
+    gtk_list_store_append(ExtensionListModel, &treeIter);
+    gtk_list_store_set(ExtensionListModel, &treeIter,
+                       EXTENSION_NAME,      _("FLAC file support"),
+#ifdef ENABLE_FLAC
+                       EXTENSION_STATUT,    _("enabled"),
+#else
+                       EXTENSION_STATUT,    _("disabled"),
+#endif
+                       -1);
+    // MP4
+    gtk_list_store_append(ExtensionListModel, &treeIter);
+    gtk_list_store_set(ExtensionListModel, &treeIter,
+                       EXTENSION_NAME,      _("MP4/AAC file support"),
+#ifdef ENABLE_MP4
+                       EXTENSION_STATUT,    _("enabled"),
+#else
+                       EXTENSION_STATUT,    _("disabled"),
+#endif
+                       -1);
+    // WavPack
+    gtk_list_store_append(ExtensionListModel, &treeIter);
+    gtk_list_store_set(ExtensionListModel, &treeIter,
+                       EXTENSION_NAME,      _("WavPack file support"),
+#ifdef ENABLE_WAVPACK
+                       EXTENSION_STATUT,    _("enabled"),
+#else
+                       EXTENSION_STATUT,    _("disabled"),
+#endif
+                       -1);
+
+
+    /*
      * Tab for thanks
      */
 
     Label = gtk_label_new(_("Thanks"));
     Frame = gtk_frame_new(NULL);
-    gtk_notebook_append_page (GTK_NOTEBOOK(AboutNoteBook),Frame,Label);
+    gtk_notebook_append_page(GTK_NOTEBOOK(AboutNoteBook),Frame,Label);
 
     ScrollWindow = gtk_scrolled_window_new(NULL,NULL);
     gtk_container_add(GTK_CONTAINER(Frame),ScrollWindow);
@@ -383,10 +488,10 @@ void Show_About_Window (void)
     //gtk_text_buffer_create_tag(TextBuffer, "x-large", "scale", PANGO_SCALE_X_LARGE, NULL);
     //gtk_text_buffer_create_tag(TextBuffer, "monospace", "family", "monospace", NULL);
 
-    gtk_text_buffer_get_iter_at_offset(TextBuffer, &iter, 0);
+    gtk_text_buffer_get_iter_at_offset(TextBuffer, &textIter, 0);
 
     temp_str = _("Translations:\n");
-    gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &iter,
+    gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &textIter,
                                              temp_str, -1,
                                              "bold", "underline", "large", NULL);
 
@@ -397,7 +502,7 @@ void Show_About_Window (void)
             temp_str = convert_string(translations_thanks_text[i][0], "iso-8859-1", "utf-8",TRUE);
         else
             temp_str = g_strdup(translations_thanks_text[i][0]);
-        gtk_text_buffer_insert(TextBuffer, &iter, temp_str, -1);
+        gtk_text_buffer_insert(TextBuffer, &textIter, temp_str, -1);
         g_free(temp_str);
 
         // Translation language
@@ -405,19 +510,19 @@ void Show_About_Window (void)
             temp_str = convert_string(translations_thanks_text[i][1], "iso-8859-1", "utf-8",TRUE);
         else
             temp_str = g_strdup(translations_thanks_text[i][1]);
-        gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &iter, temp_str, -1,
+        gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &textIter, temp_str, -1,
                                                  "italic", NULL);
         g_free(temp_str);
-        gtk_text_buffer_insert(TextBuffer, &iter, "\n", -1);
+        gtk_text_buffer_insert(TextBuffer, &textIter, "\n", -1);
     }
 
-    gtk_text_buffer_insert(TextBuffer, &iter, "\n", -1);
+    gtk_text_buffer_insert(TextBuffer, &textIter, "\n", -1);
 
     temp_str = _("General:\n");
-    gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &iter,
+    gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &textIter,
                                              temp_str, -1,
                                              "bold", "underline", "large", NULL);
-    gtk_text_buffer_insert(TextBuffer, &iter, general_thanks_text, -1);
+    gtk_text_buffer_insert(TextBuffer, &textIter, general_thanks_text, -1);
 
     TextView = gtk_text_view_new_with_buffer(TextBuffer);
     gtk_container_add(GTK_CONTAINER(ScrollWindow),TextView);
@@ -441,19 +546,19 @@ void Show_About_Window (void)
                                    GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
 
     TextBuffer = gtk_text_buffer_new(NULL);
-    gtk_text_buffer_get_iter_at_offset(TextBuffer, &iter, 0);
+    gtk_text_buffer_get_iter_at_offset(TextBuffer, &textIter, 0);
     gtk_text_buffer_create_tag(TextBuffer, "monospace", "family", "monospace", NULL);
     gtk_text_buffer_create_tag(TextBuffer, "red_foreground", "foreground", "red", NULL);
     gtk_text_buffer_create_tag(TextBuffer, "blue_foreground", "foreground", "blue", NULL);
     gtk_text_buffer_create_tag(TextBuffer, "bold", "weight", PANGO_WEIGHT_BOLD, NULL);
 
-    gtk_text_buffer_get_iter_at_offset(TextBuffer, &iter, 0);
+    gtk_text_buffer_get_iter_at_offset(TextBuffer, &textIter, 0);
 
     // The file 'ChangeLog' to read
     if ( (file=fopen(PACKAGE_DATA_DIR"/ChangeLog","r"))==0 )
     {
         gchar *msg = g_strdup_printf(_("Can't open file '%s' (%s)\n"),PACKAGE_DATA_DIR"/ChangeLog",g_strerror(errno));
-        gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &iter,
+        gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &textIter,
                                                  msg, -1,
                                                  "monospace", "red_foreground", NULL);
         g_free(msg);
@@ -479,26 +584,26 @@ void Show_About_Window (void)
                 first_version++;
                 // To set to bold the title of the version and to red the first version
                 if (first_version > 2) // As title takes 2 lines
-                    gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &iter,
+                    gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &textIter,
                                                              tmp, -1,
                                                              "monospace", "bold", NULL);
                 else
-                    gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &iter,
+                    gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &textIter,
                                                              tmp, -1,
                                                              "monospace", "bold", "blue_foreground", NULL);
             }else
             {
                 if (first_version > 2) // As title takes 2 lines
-                    gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &iter,
+                    gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &textIter,
                                                              tmp, -1,
                                                              "monospace", NULL);
                 else
-                    gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &iter,
+                    gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &textIter,
                                                              tmp, -1,
                                                              "monospace", "blue_foreground", NULL);
             }
 
-            gtk_text_buffer_insert(TextBuffer, &iter, "\n", -1);
+            gtk_text_buffer_insert(TextBuffer, &textIter, "\n", -1);
             g_free(tmp);
         }
         fclose(file);
@@ -513,7 +618,7 @@ void Show_About_Window (void)
     /*
      * Close Button
      */
-    Button = Create_Button_With_Pixmap(BUTTON_CLOSE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(AboutWindow)->action_area),Button,FALSE,FALSE,0);
     g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(Quit_About_Window),NULL);
     GTK_WIDGET_SET_FLAGS(Button,GTK_CAN_DEFAULT);
@@ -532,6 +637,8 @@ void About_Window_Go_To_Home_Page (void)
 #ifdef WIN32
     ET_Win32_Notify_Uri(WEBPAGE);
 #else
-    system("gnome-moz-remote "WEBPAGE);
+    if (system("gnome-moz-remote "WEBPAGE)!=0)
+        if (system("x-www-browser "WEBPAGE)!=0)
+            system("www-browser "WEBPAGE);
 #endif
 }
diff --git a/src/bar.c b/src/bar.c
index fc44855..6f75403 100755..100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -233,7 +233,7 @@ void Create_UI (GtkWidget **ppmenubar, GtkWidget **pptoolbar)
         { AM_OPEN_OPTIONS_WINDOW,   GTK_STOCK_PREFERENCES,  _("_Preferences ..."),                  "<Alt>P",     _("Preferences ..."),                 G_CALLBACK(Open_OptionsWindow) },
 
         { MENU_HELP,                NULL,                   _("_Help"),                             NULL,         NULL,                                 NULL },
-        { AM_OPEN_ABOUT_WINDOW,     GTK_STOCK_HELP,         _("_About"),                            NULL,         _("About"),                           G_CALLBACK(Show_About_Window) },
+        { AM_OPEN_ABOUT_WINDOW,     GTK_STOCK_ABOUT,        _("_About"),                            NULL,         _("About"),                           G_CALLBACK(Show_About_Window) },
 
 
         /*
diff --git a/src/browser.c b/src/browser.c
index e807e7a..3261692 100755..100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -527,7 +527,7 @@ gboolean Browser_List_Key_Press (GtkWidget *list, GdkEvent *event, gpointer data
             {
                 gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &currentIter, 
                                    LIST_FILE_POINTER, &currentETFile, 
-                                   LIST_FILE_NAME, &current_filename, 
+                                   LIST_FILE_NAME,    &current_filename, 
                                    -1);
 
                 /* UTF-8 comparison */
@@ -688,13 +688,13 @@ gboolean Browser_Tree_Node_Selected (GtkTreeSelection *selection, gpointer user_
     {
         gtk_tree_view_expand_row(GTK_TREE_VIEW(BrowserTree), selectedPath, FALSE);
     }
+    gtk_tree_path_free(selectedPath);
 
     /* Don't start a new reading, if another one is running... */
     if (ReadingDirectory == TRUE)
         return TRUE;
 
     //Browser_Tree_Set_Node_Visible(BrowserTree, selectedPath);
-    gtk_tree_path_free(selectedPath);
     gtk_tree_model_get(GTK_TREE_MODEL(directoryTreeModel), &selectedIter,
                        TREE_COLUMN_FULL_PATH, &pathName, -1);
     if (!pathName)
@@ -738,13 +738,40 @@ gboolean Browser_Tree_Node_Selected (GtkTreeSelection *selection, gpointer user_
     gtk_entry_set_text(GTK_ENTRY(GTK_BIN(BrowserEntryCombo)->child), pathName_utf8);
 
     /* Start to read the directory */
-    /* The first time 'counter' is equal to zero and if we don't want to load
-     * directory on startup, we skip the 'reading', but we must read it */
+    /* The first time, 'counter' is equal to zero. And if we don't want to load
+     * directory on startup, we skip the 'reading', but newt we must read it each time */
     if (LOAD_ON_STARTUP || counter)
-        Read_Directory(pathName);
-    else
+    {
+        gboolean dir_loaded;
+        GtkTreeIter parentIter;
+        
+        dir_loaded = Read_Directory(pathName);
+            
+        // If the directory can't be loaded, the directory musn't exist.
+        // So we load the parent node and refresh the children
+        if (dir_loaded == FALSE)
+        {
+            if (gtk_tree_selection_get_selected(selection, NULL, &selectedIter))
+            {
+                if (gtk_tree_model_iter_parent(GTK_TREE_MODEL(directoryTreeModel),&parentIter,&selectedIter) )
+                {
+                    gtk_tree_selection_select_iter(selection,&parentIter);
+                    selectedPath = gtk_tree_model_get_path(GTK_TREE_MODEL(directoryTreeModel), &parentIter);
+                    gtk_tree_view_collapse_row(GTK_TREE_VIEW(BrowserTree),selectedPath);
+                    if (OPEN_SELECTED_BROWSER_NODE)
+                    {
+                        gtk_tree_view_expand_row(GTK_TREE_VIEW(BrowserTree),selectedPath,FALSE);
+                    }
+                    gtk_tree_path_free(selectedPath);
+                }
+            }
+        }
+
+    }else
+    {
         /* As we don't use the function 'Read_Directory' we must add this function here */
         Update_Command_Buttons_Sensivity();
+    }
     counter++;
 
     g_free(pathName);
@@ -796,7 +823,6 @@ gint Browser_Tree_Select_Dir (gchar *current_path)
 {
     GtkTreePath *rootPath = NULL;
     GtkTreeIter parentNode, currentNode;
-    struct stat stbuf;
     gint index = 1; // Skip the first token as it is NULL due to leading /
     gchar **parts;
     gchar *nodeName;
@@ -815,26 +841,9 @@ gint Browser_Tree_Select_Dir (gchar *current_path)
     ET_Win32_Path_Remove_Trailing_Backslash(current_path);
 #endif
 
-    /* If path is invalid: inform the user, but load the first directories
-     * of the full path while parent directories are valid */
-    if (stat(current_path,&stbuf)==-1)
-    {
-        GtkWidget *msgbox;
-        gchar *msg;
-        gchar *current_path_utf8;
-
-        current_path_utf8 = filename_to_display(current_path);
-        msg = g_strdup_printf(_("The entered path is invalid!:\n%s\n(%s)"),
-            current_path_utf8,g_strerror(errno));
-        msgbox = msg_box_new(_("Error..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
-        g_free(msg);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        msg_box_run(MSG_BOX(msgbox));
-        gtk_widget_destroy(msgbox);
-        g_free(current_path_utf8);
-        return FALSE;
-    }
-
+    /* Don't check here if the path is valid. It will be done later when 
+     * selecting a node in the tree */
+        
     Browser_Update_Current_Path(current_path);
 
     parts = g_strsplit((const gchar*)current_path, G_DIR_SEPARATOR_S, 0);
@@ -897,6 +906,7 @@ gint Browser_Tree_Select_Dir (gchar *current_path)
     if (rootPath)
     {
         gtk_tree_view_expand_to_path(GTK_TREE_VIEW(BrowserTree), rootPath);
+        // Select the node to load the corresponding directory
         gtk_tree_selection_select_path(gtk_tree_view_get_selection(GTK_TREE_VIEW(BrowserTree)), rootPath);
         Browser_Tree_Set_Node_Visible(BrowserTree, rootPath);
         gtk_tree_path_free(rootPath);
@@ -935,7 +945,8 @@ void Browser_List_Row_Selected (GtkTreeSelection *selection, gpointer data)
         // Returns the last line selected (in ascending line order) to display the item
         lastSelected = (GtkTreePath *)g_list_last(selectedRows)->data;
         if (gtk_tree_model_get_iter(GTK_TREE_MODEL(fileListModel), &lastFile, lastSelected))
-            gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &lastFile, LIST_FILE_POINTER, &fileETFile, -1);
+            gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &lastFile, 
+                               LIST_FILE_POINTER, &fileETFile, -1);
 
         Action_Select_Nth_File_By_Etfile(fileETFile);
     }else
@@ -988,10 +999,10 @@ void Browser_List_Load_File_List (GList *etfilelist, ET_File *etfile_to_select)
         // File list displays the current filename (name on HD)
         gtk_list_store_append(fileListModel, &row);
         gtk_list_store_set(fileListModel, &row,
-                           LIST_FILE_NAME, basename_utf8,
-                           LIST_FILE_POINTER, etfilelist->data,
-                           LIST_FILE_KEY, fileKey,
-                           LIST_FILE_OTHERDIR, activate_bg_color,
+                           LIST_FILE_NAME,      basename_utf8,
+                           LIST_FILE_POINTER,   etfilelist->data,
+                           LIST_FILE_KEY,       fileKey,
+                           LIST_FILE_OTHERDIR,  activate_bg_color,
                            -1);
         g_free(basename_utf8);
 
@@ -1278,14 +1289,23 @@ void Browser_List_Set_Row_Appearance (GtkTreeIter *iter)
     {
         if (CHANGED_FILES_DISPLAYED_TO_BOLD)
         {
-            gtk_list_store_set(fileListModel, iter, LIST_FONT_WEIGHT, PANGO_WEIGHT_BOLD, LIST_ROW_BACKGROUND, backgroundcolor, LIST_ROW_FOREGROUND, NULL, -1);
+            gtk_list_store_set(fileListModel, iter, 
+                               LIST_FONT_WEIGHT, PANGO_WEIGHT_BOLD, 
+                               LIST_ROW_BACKGROUND, backgroundcolor, 
+                               LIST_ROW_FOREGROUND, NULL, -1);
         } else
         {
-            gtk_list_store_set(fileListModel, iter, LIST_FONT_WEIGHT, PANGO_WEIGHT_NORMAL, LIST_ROW_BACKGROUND, backgroundcolor, LIST_ROW_FOREGROUND, &RED, -1);
+            gtk_list_store_set(fileListModel, iter, 
+                               LIST_FONT_WEIGHT, PANGO_WEIGHT_NORMAL, 
+                               LIST_ROW_BACKGROUND, backgroundcolor, 
+                               LIST_ROW_FOREGROUND, &RED, -1);
         }
     } else
     {
-        gtk_list_store_set(fileListModel, iter, LIST_FONT_WEIGHT, PANGO_WEIGHT_NORMAL, LIST_ROW_BACKGROUND, backgroundcolor, LIST_ROW_FOREGROUND, NULL ,-1);
+        gtk_list_store_set(fileListModel, iter, 
+                           LIST_FONT_WEIGHT, PANGO_WEIGHT_NORMAL, 
+                           LIST_ROW_BACKGROUND, backgroundcolor, 
+                           LIST_ROW_FOREGROUND, NULL ,-1);
     }
     // Frees allocated item from gtk_tree_model_get...
     g_free(temp);
@@ -1317,7 +1337,8 @@ void Browser_List_Remove_File (ET_File *searchETFile)
         valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(fileListModel), &currentIter, currentPath);
         if (valid)
         {
-            gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &currentIter, LIST_FILE_POINTER, &currentETFile, -1);
+            gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &currentIter, 
+                               LIST_FILE_POINTER, &currentETFile, -1);
 
             if (currentETFile == searchETFile)
             {
@@ -1392,7 +1413,8 @@ GtkTreePath *Browser_List_Select_File_By_Etfile2 (ET_File *searchETFile, gboolea
         valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(fileListModel), &currentIter, startPath);
         if (valid)
         {
-            gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &currentIter, LIST_FILE_POINTER, &currentETFile, -1);
+            gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &currentIter, 
+                               LIST_FILE_POINTER, &currentETFile, -1);
             // It is the good file?
             if (currentETFile == searchETFile)
             {
@@ -1410,7 +1432,8 @@ GtkTreePath *Browser_List_Select_File_By_Etfile2 (ET_File *searchETFile, gboolea
         valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(fileListModel), &currentIter, currentPath);
         if (valid)
         {
-            gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &currentIter, LIST_FILE_POINTER, &currentETFile, -1);
+            gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &currentIter, 
+                               LIST_FILE_POINTER, &currentETFile, -1);
 
             if (currentETFile == searchETFile)
             {
@@ -1548,7 +1571,8 @@ void Browser_List_Unselect_File_By_Etfile(ET_File *searchETFile)
         valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(fileListModel), &currentIter, currentPath);
         if (valid)
         {
-            gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &currentIter, LIST_FILE_POINTER, &currentETFile, -1);
+            gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &currentIter, 
+                               LIST_FILE_POINTER, &currentETFile, -1);
 
             if (currentETFile == searchETFile)
             {
@@ -3064,6 +3088,8 @@ GtkWidget *Create_Browser_Items (GtkWidget *parent)
     gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(BrowserList), FALSE);
     gtk_container_add(GTK_CONTAINER(ScrollWindowFileList), BrowserList);
     gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(BrowserList), FALSE);
+    
+    // Column for File Name
     renderer = gtk_cell_renderer_text_new();
     column = gtk_tree_view_column_new();
     gtk_tree_view_column_pack_start(column, renderer, FALSE);
@@ -3075,6 +3101,7 @@ GtkWidget *Create_Browser_Items (GtkWidget *parent)
                                         NULL);
     gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
     gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    
     gtk_tree_view_set_reorderable(GTK_TREE_VIEW(BrowserList), FALSE);
     gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(BrowserList)),GTK_SELECTION_MULTIPLE);
     // When selecting a line
@@ -3274,14 +3301,14 @@ void Browser_Open_Rename_Directory_Window (void)
     gtk_box_set_spacing(GTK_BOX(ButtonBox),10);
 
     /* Button to cancel */
-    Button = Create_Button_With_Pixmap(BUTTON_CANCEL);
+    Button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
     gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
     GTK_WIDGET_SET_FLAGS(Button,GTK_CAN_DEFAULT);
-    //gtk_widget_grab_default(Button);
+    gtk_widget_grab_default(Button);
     g_signal_connect_swapped(G_OBJECT(Button),"clicked",G_CALLBACK(Destroy_Rename_Directory_Window), G_OBJECT(RenameDirectoryCombo));
 
     /* Button to save: to rename directory */
-    Button = Create_Button_With_Pixmap(BUTTON_APPLY);
+    Button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
     gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
     GTK_WIDGET_SET_FLAGS(Button,GTK_CAN_DEFAULT);
     g_signal_connect_swapped(G_OBJECT(Button),"clicked", G_CALLBACK(Rename_Directory),NULL);
@@ -3670,14 +3697,14 @@ void Browser_Open_Run_Program_Tree_Window (void)
     gtk_box_set_spacing(GTK_BOX(ButtonBox), 10);
 
     /* Button to cancel */
-    Button = Create_Button_With_Pixmap(BUTTON_CANCEL);
+    Button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
     gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
     GTK_WIDGET_SET_FLAGS(Button,GTK_CAN_DEFAULT);
     gtk_widget_grab_default(Button);
     g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(Destroy_Run_Program_Tree_Window),NULL);
 
     /* Button to execute */
-    Button = Create_Button_With_Pixmap(BUTTON_EXECUTE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_EXECUTE);
     gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
     GTK_WIDGET_SET_FLAGS(Button,GTK_CAN_DEFAULT);
     g_signal_connect_swapped(G_OBJECT(Button),"clicked", G_CALLBACK(Run_Program_With_Directory),G_OBJECT(RunProgramComboBox));
@@ -3830,14 +3857,14 @@ void Browser_Open_Run_Program_List_Window (void)
     gtk_box_set_spacing(GTK_BOX(ButtonBox), 10);
 
     /* Button to cancel */
-    Button = Create_Button_With_Pixmap(BUTTON_CANCEL);
+    Button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
     gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
     GTK_WIDGET_SET_FLAGS(Button,GTK_CAN_DEFAULT);
     gtk_widget_grab_default(Button);
     g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(Destroy_Run_Program_List_Window),NULL);
 
     /* Button to execute */
-    Button = Create_Button_With_Pixmap(BUTTON_EXECUTE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_EXECUTE);
     gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
     GTK_WIDGET_SET_FLAGS(Button,GTK_CAN_DEFAULT);
     g_signal_connect_swapped(G_OBJECT(Button),"clicked", G_CALLBACK(Run_Program_With_Selected_Files),G_OBJECT(RunProgramComboBox));
@@ -3955,7 +3982,8 @@ gboolean Run_Program (gchar *program_name, GList *args_list)
     {
         GtkWidget *msgbox;
 
-        msgbox = msg_box_new(_("Error..."),_("You must type a program name!"),GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
+        msgbox = msg_box_new(_("Error..."),_("You must type a program name!"),
+                             GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
         msg_box_hide_check_button(MSG_BOX(msgbox));
         msg_box_run(MSG_BOX(msgbox));
         gtk_widget_destroy(msgbox);
diff --git a/src/browser.h b/src/browser.h
index 3720c38..fb02029 100755..100644
--- a/src/browser.h
+++ b/src/browser.h
@@ -80,6 +80,18 @@ enum
     LIST_FONT_WEIGHT,
     LIST_ROW_BACKGROUND,
     LIST_ROW_FOREGROUND,
+    // Tag fields
+    /*LIST_FILE_TITLE,
+    LIST_FILE_ARTIST,
+    LIST_FILE_ALBUM,
+    LIST_FILE_YEAR,
+    LIST_FILE_GENRE,
+    LIST_FILE_COMMENT,
+    LIST_FILE_COMPOSER,
+    LIST_FILE_ORIG_ARTIST,
+    LIST_FILE_COPYRIGHT,
+    LIST_FILE_URL,
+    LIST_FILE_ENCODED_BY,*/
     LIST_COLUMN_COUNT
 };
 
diff --git a/src/cddb.c b/src/cddb.c
index f3cc888..e8cf147 100644
--- a/src/cddb.c
+++ b/src/cddb.c
@@ -286,7 +286,7 @@ void Open_Cddb_Window (void)
     gtk_box_pack_start(GTK_BOX(hbox),Label,FALSE,FALSE,0);
 
     // Button to generate CddbId and request string from the selected files
-    CddbSearchAutoButton = Create_Button_With_Pixmap(BUTTON_SEARCH);
+    CddbSearchAutoButton = gtk_button_new_from_stock(GTK_STOCK_FIND);
     gtk_box_pack_start(GTK_BOX(hbox),CddbSearchAutoButton,FALSE,FALSE,0);
     GTK_WIDGET_SET_FLAGS(CddbSearchAutoButton,GTK_CAN_DEFAULT);
     gtk_widget_grab_default(CddbSearchAutoButton);
@@ -347,7 +347,7 @@ void Open_Cddb_Window (void)
     g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(ET_Sort_Displayed_File_List_And_Update_UI),GINT_TO_POINTER(SORTING_BY_ASCENDING_TRACK_NUMBER));
 */
     // Button to quit
-    Button = Create_Button_With_Pixmap(BUTTON_CLOSE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
     gtk_box_pack_end(GTK_BOX(hbox),Button,FALSE,FALSE,0);
     GTK_WIDGET_SET_FLAGS(Button,GTK_CAN_DEFAULT);
     g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(Cddb_Destroy_Window),NULL);
@@ -396,7 +396,7 @@ void Open_Cddb_Window (void)
     gtk_editable_paste_clipboard(GTK_EDITABLE(GTK_BIN(CddbSearchStringCombo)->child));
 
     // Button to run the search
-    CddbSearchButton = Create_Button_With_Pixmap(BUTTON_SEARCH);
+    CddbSearchButton = gtk_button_new_from_stock(GTK_STOCK_FIND);
     gtk_box_pack_start(GTK_BOX(hbox),CddbSearchButton,FALSE,FALSE,0);
     GTK_WIDGET_SET_FLAGS(CddbSearchButton,GTK_CAN_DEFAULT);
     gtk_widget_grab_default(CddbSearchButton);
@@ -414,7 +414,7 @@ void Open_Cddb_Window (void)
     gtk_tooltips_set_tip(Tips,CddbStopSearchButton,_("Stop the search ..."),NULL);
 
     // Button to quit
-    Button = Create_Button_With_Pixmap(BUTTON_CLOSE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
     gtk_box_pack_end(GTK_BOX(hbox),Button,FALSE,FALSE,0);
     GTK_WIDGET_SET_FLAGS(Button,GTK_CAN_DEFAULT);
     g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(Cddb_Destroy_Window),NULL);
@@ -783,7 +783,7 @@ void Open_Cddb_Window (void)
     g_signal_connect(G_OBJECT(CddbUseDLM2),"toggled",G_CALLBACK(Cddb_Use_Dlm_2_Check_Button_Toggled),NULL);
 
     // Button to apply
-    CddbApplyButton = Create_Button_With_Pixmap(BUTTON_APPLY);
+    CddbApplyButton = gtk_button_new_from_stock(GTK_STOCK_APPLY);
     gtk_box_pack_end(GTK_BOX(hbox),CddbApplyButton,FALSE,FALSE,2);
     g_signal_connect(G_OBJECT(CddbApplyButton),"clicked", G_CALLBACK(Cddb_Set_Track_Infos_To_File_List),NULL);
     gtk_tooltips_set_tip(Tips,CddbApplyButton,_("Load the selected lines or all lines (if no line selected)."),NULL);
@@ -828,10 +828,6 @@ gboolean Cddb_Destroy_Window (GtkWidget *widget, GdkEvent *event, gpointer data)
     {
         Cddb_Window_Apply_Changes();
 
-        // Save combobox history lists before exit
-        Save_Cddb_Search_String_List(CddbSearchStringModel, MISC_COMBO_TEXT);
-        Save_Cddb_Search_String_In_Result_List(CddbSearchStringInResultModel, MISC_COMBO_TEXT);
-
         // FIX ME : This causes problem with memory !!
         Cddb_Free_Album_List();
 
@@ -908,6 +904,9 @@ void Cddb_Window_Apply_Changes (void)
         CDDB_USE_DLM            = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(CddbUseDLM2));
         CDDB_USE_LOCAL_ACCESS   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(CddbUseLocalAccess));
 
+        // Save combobox history lists before exit
+        Save_Cddb_Search_String_List(CddbSearchStringModel, MISC_COMBO_TEXT);
+        Save_Cddb_Search_String_In_Result_List(CddbSearchStringInResultModel, MISC_COMBO_TEXT);
     }
 }
 
@@ -1494,30 +1493,35 @@ GtkWidget *Create_Cddb_Track_List_Popup_Menu(GtkWidget *list)
 
     CddbPopupMenu = gtk_menu_new();
     g_signal_connect_swapped(G_OBJECT(list), "button_press_event",
-        G_CALLBACK(Cddb_Popup_Menu_Handler), G_OBJECT(CddbPopupMenu));
+                            G_CALLBACK(Cddb_Popup_Menu_Handler), G_OBJECT(CddbPopupMenu));
 
     MenuItem = gtk_menu_item_new_with_label(_("Select all lines"));
     gtk_menu_shell_append(GTK_MENU_SHELL(CddbPopupMenu), MenuItem);
-    g_signal_connect(G_OBJECT(MenuItem),"activate", G_CALLBACK(Cddb_Track_List_Select_All),NULL);
+    g_signal_connect(G_OBJECT(MenuItem),"activate",
+                     G_CALLBACK(Cddb_Track_List_Select_All),NULL);
 
     MenuItem = gtk_menu_item_new_with_label(_("Unselect all lines"));
     gtk_menu_shell_append(GTK_MENU_SHELL(CddbPopupMenu), MenuItem);
-    g_signal_connect(G_OBJECT(MenuItem),"activate", G_CALLBACK(Cddb_Track_List_Unselect_All),NULL);
+    g_signal_connect(G_OBJECT(MenuItem),"activate", 
+                     G_CALLBACK(Cddb_Track_List_Unselect_All),NULL);
 
     MenuItem = gtk_menu_item_new_with_label(_("Invert selection"));
     gtk_menu_shell_append(GTK_MENU_SHELL(CddbPopupMenu), MenuItem);
-    g_signal_connect(G_OBJECT(MenuItem),"activate", G_CALLBACK(Cddb_Track_List_Invert_Selection),NULL);
+    g_signal_connect(G_OBJECT(MenuItem),"activate", 
+                     G_CALLBACK(Cddb_Track_List_Invert_Selection),NULL);
 
     MenuItem = gtk_menu_item_new();
     gtk_menu_shell_append(GTK_MENU_SHELL(CddbPopupMenu), MenuItem);
 
     MenuItem = gtk_menu_item_new_with_label(_("Sort by Track Number"));
     gtk_menu_shell_append(GTK_MENU_SHELL(CddbPopupMenu),MenuItem);
-    g_signal_connect(G_OBJECT(MenuItem),"activate",G_CALLBACK(Cddb_Track_List_Sort_By_Ascending_Track_Number),NULL);
+    g_signal_connect(G_OBJECT(MenuItem),"activate",
+                     G_CALLBACK(Cddb_Track_List_Sort_By_Ascending_Track_Number),NULL);
 
     MenuItem = gtk_menu_item_new_with_label(_("Sort by Track Name"));
     gtk_menu_shell_append(GTK_MENU_SHELL(CddbPopupMenu),MenuItem);
-    g_signal_connect(G_OBJECT(MenuItem),"activate",G_CALLBACK(Cddb_Track_List_Sort_By_Ascending_Track_Name),NULL);
+    g_signal_connect(G_OBJECT(MenuItem),"activate",
+                     G_CALLBACK(Cddb_Track_List_Sort_By_Ascending_Track_Name),NULL);
 
     gtk_widget_show_all(CddbPopupMenu);
     return CddbPopupMenu;
@@ -1603,7 +1607,7 @@ gint Cddb_Open_Connection (gchar *host, gint port)
     struct hostent    *hostent;
     struct sockaddr_in sockaddr;
     gint               optval = 1;
-    gchar *msg;
+    gchar             *msg;
 
 
     if (!CddbWindow)
@@ -1753,13 +1757,14 @@ gint Cddb_Write_Result_To_File (gint socket_id, gulong *bytes_read_total)
                 gtk_main_iteration();
         }
 
+        fclose(file);
+
         if (bytes_read < 0)
         {
             Log_Print(_("Error when reading cddb response (%s)!"),g_strerror(errno));
             return -1; // Error!
         }
 
-        fclose(file);
     } else
     {
         Log_Print(_("Can't create file '%s' (%s)"),file_path,g_strerror(errno));
@@ -1767,7 +1772,6 @@ gint Cddb_Write_Result_To_File (gint socket_id, gulong *bytes_read_total)
     g_free(file_path);
     g_free(home_path);
 
-
     return 0;
 }
 
@@ -1789,11 +1793,12 @@ gint Cddb_Write_Result_To_File (gint socket_id, gulong *bytes_read_total)
  */
 gint Cddb_Read_Line (FILE **file, gchar **cddb_out)
 {
-    gchar buffer[MAX_STRING_LEN];
-
+    gchar  buffer[MAX_STRING_LEN];
+    gchar *result;
 
     if (*file == NULL)
     {
+        // Open the file for reading the first time
         gchar *home_path;
         gchar *file_path;
 
@@ -1812,7 +1817,8 @@ gint Cddb_Read_Line (FILE **file, gchar **cddb_out)
         g_free(file_path);
     }
 
-    if (fgets(buffer,sizeof(buffer),*file))
+    result = fgets(buffer,sizeof(buffer),*file);
+    if (result != NULL && result != (gchar *)EOF)
     {
         if (buffer && strlen(buffer)>0 && buffer[strlen(buffer)-1]=='\n')
             buffer[strlen(buffer)-1]='\0';
@@ -1821,8 +1827,9 @@ gint Cddb_Read_Line (FILE **file, gchar **cddb_out)
         *cddb_out = g_strdup(buffer);
     }else
     {
-        // On error or EOF
+        // On error, or EOF
         fclose(*file);
+        *file = NULL;
         
         //*cddb_out = NULL;
         *cddb_out = g_strdup(""); // To avoid a crash
@@ -1841,6 +1848,7 @@ gint Cddb_Read_Line (FILE **file, gchar **cddb_out)
 gint Cddb_Read_Http_Header (FILE **file, gchar **cddb_out)
 {
 
+    // The 'file' is opened (if no error) in this function
     if ( Cddb_Read_Line(file,cddb_out) < 0 )
         return -1; // Error!
 
@@ -2291,6 +2299,8 @@ gboolean Cddb_Search_Album_List_From_String_Freedb (void)
         g_free(cddb_server_cgi_path);
         gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchButton),FALSE);
         gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchAutoButton),FALSE);
+        if (file)
+            fclose(file);
         return FALSE;
     }
     g_free(cddb_out);
@@ -2413,6 +2423,13 @@ gboolean Cddb_Search_Album_List_From_String_Freedb (void)
     g_free(cddb_server_name);
     g_free(cddb_server_cgi_path);
 
+    // Close file opened for reading lines
+    if (file)
+    {
+        fclose(file);
+        file = NULL;
+    }
+
     gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchButton),FALSE);
     gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchAutoButton),FALSE);
 
@@ -2463,8 +2480,8 @@ gboolean Cddb_Search_Album_List_From_String_Gnudb (void)
     gint   bytes_written;
     gulong bytes_read_total = 0;
     FILE  *file;
-    gint  num_albums = 0;
-    gint  total_num_albums = 0;
+    gint   num_albums = 0;
+    gint   total_num_albums = 0;
 
     gchar *next_page = NULL;
     gint   next_page_cpt = 0;
@@ -2603,6 +2620,8 @@ gboolean Cddb_Search_Album_List_From_String_Gnudb (void)
             g_free(cddb_server_cgi_path);
             gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchButton),FALSE);
             gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchAutoButton),FALSE);
+            if (file)
+                fclose(file);
             return FALSE;
         }
         g_free(cddb_out);
@@ -2746,6 +2765,13 @@ gboolean Cddb_Search_Album_List_From_String_Gnudb (void)
         g_free(cddb_server_name);
         g_free(cddb_server_cgi_path);
 
+        // Close file opened for reading lines
+        if (file)
+        {
+            fclose(file);
+            file = NULL;
+        }
+
         // Close connection
         Cddb_Close_Connection(socket_id);
 
@@ -2935,16 +2961,16 @@ gboolean Cddb_Search_Album_From_Selected_Files (void)
         // We check if the file corresponding to the discid exists in each directory
         for (i=0; i<=CddbDirSize; i++)
         {
-            FILE *file;
             gchar *file_path;
 
             if (!CDDB_LOCAL_PATH || strlen(CDDB_LOCAL_PATH)==0)
             {
                 GtkWidget *msgbox;
 
-                msgbox = msg_box_new(_("Local CD search..."),_("The path for 'Local "
-                                       "CD Data Base' wasn't defined!\nFill it in the "
-                                       "preferences window."),GTK_STOCK_DIALOG_ERROR,BUTTON_YES,0);
+                msgbox = msg_box_new(_("Local CD search..."),
+                                     _("The path for 'Local CD Data Base' wasn't "
+                                       "defined!\nFill it in the preferences window."),
+                                     GTK_STOCK_DIALOG_ERROR,BUTTON_YES,0);
                 msg_box_hide_check_button(MSG_BOX(msgbox));
                 msg_box_run(MSG_BOX(msgbox));
                 gtk_widget_destroy(msgbox);
@@ -3014,8 +3040,10 @@ gboolean Cddb_Search_Album_From_Selected_Files (void)
 
                 CddbAlbumList = g_list_append(CddbAlbumList,cddbalbum);
 
-                if (rc != 0) // Need to close it, if not done in Cddb_Read_Line
+                // Need to close it, if not done in Cddb_Read_Line
+                if (file)
                     fclose(file);
+                file = NULL;
             }
             g_free(file_path);
 
@@ -3138,6 +3166,8 @@ gboolean Cddb_Search_Album_From_Selected_Files (void)
                 g_free(cddb_server_cgi_path);
                 gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchButton),FALSE);
                 gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchAutoButton),FALSE);
+                if (file)
+                    fclose(file);
                 return FALSE;
             }
             g_free(cddb_out);
@@ -3222,6 +3252,13 @@ gboolean Cddb_Search_Album_From_Selected_Files (void)
             g_free(cddb_server_name);
             g_free(cddb_server_cgi_path);
 
+            // Close file opened for reading lines
+            if (file)
+            {
+                fclose(file);
+                file = NULL;
+            }
+            
             // Close connection
             Cddb_Close_Connection(socket_id);
         }
@@ -3291,7 +3328,7 @@ gboolean Cddb_Get_Album_Tracks_List (GtkTreeSelection* selection)
     gchar     *cddb_server_cgi_path;
     gint       bytes_written;
     gulong     bytes_read_total = 0;
-    FILE      *file;
+    FILE      *file = NULL;
     gboolean   read_track_offset = FALSE;
     GtkTreeIter row;
 
@@ -3397,6 +3434,8 @@ gboolean Cddb_Get_Album_Tracks_List (GtkTreeSelection* selection)
             Log_Print("%s",msg);
             g_free(msg);
             g_free(cddb_out);
+            if (file)
+                fclose(file);
             return FALSE;
         }
         g_free(cddb_out);
@@ -3561,6 +3600,13 @@ gboolean Cddb_Get_Album_Tracks_List (GtkTreeSelection* selection)
     }
     g_free(cddb_end_str);
 
+    // Close file opened for reading lines
+    if (file)
+    {
+        fclose(file);
+        file = NULL;
+    }
+    
     if (cddb_server_name)
     {
         // Remote access
@@ -3751,7 +3797,8 @@ gboolean Cddb_Set_Track_Infos_To_File_List (void)
         msg = g_strdup_printf(_("Be careful, you are applying %d lines of the CDDB "
                                 "results to %d lines in the list of files!\n\nDo you want to continue ?"),
                               rows_to_loop,file_selectedcount);
-        msgbox = msg_box_new(_("Write Tag from CDDB..."),msg,GTK_STOCK_DIALOG_QUESTION,BUTTON_NO,BUTTON_YES,0);
+        msgbox = msg_box_new(_("Write Tag from CDDB..."),msg,
+                             GTK_STOCK_DIALOG_QUESTION,BUTTON_NO,BUTTON_YES,0);
         msg_box_hide_check_button(MSG_BOX(msgbox));
         button = msg_box_run(MSG_BOX(msgbox));
         gtk_widget_destroy(msgbox);
@@ -3760,6 +3807,7 @@ gboolean Cddb_Set_Track_Infos_To_File_List (void)
         {
             g_list_foreach(file_iterlist, (GFunc)g_free, NULL);
             g_list_free(file_iterlist);
+            //gdk_window_raise(CddbWindow->window);
             return FALSE;
         }
     }
diff --git a/src/easytag.c b/src/easytag.c
index 2b26967..6a3bd4e 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -60,7 +60,7 @@
 #   include "win32/win32dep.h"
 #endif
 
-#include "../pixmaps/EasyTAG.xpm"
+#include "../pixmaps/EasyTAG_icon.xpm"
 
 
 /****************
@@ -140,10 +140,10 @@ int main (int argc, char *argv[])
 {
     GtkWidget *MainVBox;
     GtkWidget *HBox, *VBox;
-    GdkPixmap *pixmap;
-    GdkBitmap *mask;
     gboolean created_settings;
     struct stat statbuf;
+    GdkPixmap *pixmap;
+    GdkBitmap *mask;
 
 
 #ifdef WIN32
@@ -316,7 +316,7 @@ int main (int argc, char *argv[])
 
     /* Minimised window icon */
     gtk_widget_realize(MainWindow);
-    pixmap = gdk_pixmap_create_from_xpm_d(MainWindow->window,&mask,NULL,EasyTAG_xpm);
+    pixmap = gdk_pixmap_create_from_xpm_d(MainWindow->window,&mask,NULL,EasyTAG_icon_xpm);
     gdk_window_set_icon(MainWindow->window,(GdkWindow *)NULL,pixmap,mask);
 
 
@@ -1038,18 +1038,18 @@ GtkWidget *Create_Tag_Area (void)
     hbox = gtk_hbox_new(FALSE, 4);
     gtk_table_attach(GTK_TABLE(Table),hbox,1,4,1,2,GTK_FILL,GTK_FILL,TablePadding,TablePadding);
 
-    PictureClearButton = gtk_button_new();
-    Icon = gtk_image_new_from_stock(GTK_STOCK_REMOVE, GTK_ICON_SIZE_SMALL_TOOLBAR);
-    gtk_container_add(GTK_CONTAINER(PictureClearButton),Icon);
-    gtk_box_pack_start(GTK_BOX(hbox),PictureClearButton,FALSE,FALSE,0);
-    gtk_tooltips_set_tip(Tips,PictureClearButton,_("Remove selected pictures, else all pictures."),NULL);
-
     PictureAddButton = gtk_button_new();
     Icon = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR);
     gtk_container_add(GTK_CONTAINER(PictureAddButton),Icon);
     gtk_box_pack_start(GTK_BOX(hbox),PictureAddButton,FALSE,FALSE,0);
     gtk_tooltips_set_tip(Tips,PictureAddButton,_("Add pictures to the tag (drag and drop is also available)."),NULL);
 
+    PictureClearButton = gtk_button_new();
+    Icon = gtk_image_new_from_stock(GTK_STOCK_REMOVE, GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_container_add(GTK_CONTAINER(PictureClearButton),Icon);
+    gtk_box_pack_start(GTK_BOX(hbox),PictureClearButton,FALSE,FALSE,0);
+    gtk_tooltips_set_tip(Tips,PictureClearButton,_("Remove selected pictures, else all pictures."),NULL);
+
     Label = gtk_label_new("   ");
     gtk_box_pack_start(GTK_BOX(hbox),Label,FALSE,FALSE,0);
 
@@ -3097,7 +3097,7 @@ void Action_Select_Browser_Style (void)
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>
-void Read_Directory (gchar *path_real)
+gboolean Read_Directory (gchar *path_real)
 {
     DIR   *dir;
     gchar *msg;
@@ -3110,7 +3110,8 @@ void Read_Directory (gchar *path_real)
     GtkAction *uiaction;
     GtkWidget *TBViewMode;
 
-    if (!path_real) return;
+    if (!path_real)
+        return FALSE;
 
     ReadingDirectory = TRUE;    /* A flag to avoid to start an other reading */
 
@@ -3138,6 +3139,7 @@ void Read_Directory (gchar *path_real)
     /* Placed only here, to empty the previous list of files */
     if ((dir=opendir(path_real)) == NULL)
     {
+        // Message if the directory doesn't exist...
         GtkWidget *msgbox;
         gchar *path_utf8 = filename_to_display(path_real);
         gchar *msg;
@@ -3150,8 +3152,10 @@ void Read_Directory (gchar *path_real)
         msg_box_hide_check_button(MSG_BOX(msgbox));
         msg_box_run(MSG_BOX(msgbox));
         gtk_widget_destroy(msgbox);
+        
         ReadingDirectory = FALSE; //Allow a new reading
-        return;
+        Browser_Area_Set_Sensitive(TRUE);
+        return FALSE;
     }
     closedir(dir);
 
@@ -3266,6 +3270,8 @@ void Read_Directory (gchar *path_real)
     g_free(msg);
     Set_Unbusy_Cursor();
     ReadingDirectory = FALSE;
+    
+    return TRUE;
 }
 
 
@@ -4173,7 +4179,7 @@ void Convert_Insert_Space (GtkWidget *entry)
     strncpy(string,gtk_entry_get_text(GTK_ENTRY(entry)),string_length);
     string[string_length]='\0';
     
-    Scan_Process_Fields_Insert_Space(string);
+    Scan_Process_Fields_Insert_Space(&string);
     gtk_entry_set_text(GTK_ENTRY(entry),string);
     g_free(string);
 }
@@ -4463,6 +4469,13 @@ gchar *signal_to_string (gint signal)
  */
 void Display_Usage (void)
 {
+    // Fix from Steve Ralston for gcc-3.2.2
+#ifdef WIN32
+    #define xPREFIX "c:"
+#else
+    #define xPREFIX ""
+#endif
+
     g_print(_("\nUsage: easytag [option] "
               "\n   or: easytag [directory]\n"
               "\n"
@@ -4473,13 +4486,12 @@ void Display_Usage (void)
               "\n"
               "Directory:\n"
               "----------\n"
-#ifdef WIN32
-              "c:/path_to/files  Use an absolute path to load,\n"
-#else
-              "/path_to/files    Use an absolute path to load,\n"
-#endif
+              "%s/path_to/files  Use an absolute path to load,\n"
               "path_to/files     Use a relative path.\n"
-              "\n"));
+              "\n"),xPREFIX);
+    
+    #undef xPREFIX
+    
     exit(0);
 }
 
@@ -4535,8 +4547,8 @@ void Quit_MainWindow (void)
         if (ET_Check_If_All_Files_Are_Saved() != TRUE)
         {
             /* Some files haven't been saved */
-            msgbox = msg_box_new(_("Confirm..."),_("Some files have been modified but not "
-                "saved...\nDo you want to save them before exiting the program?"),
+            msgbox = msg_box_new(_("Confirm..."),_("Some files have been modified but "
+                "not saved...\nDo you want to save them before exiting the program?"),
                 GTK_STOCK_DIALOG_QUESTION,BUTTON_CANCEL,BUTTON_NO,BUTTON_YES,0);
             msg_box_hide_check_button(MSG_BOX(msgbox));
             button = msg_box_run(MSG_BOX(msgbox));
diff --git a/src/easytag.h b/src/easytag.h
index 1b4fdd1..9823c75 100755..100644
--- a/src/easytag.h
+++ b/src/easytag.h
@@ -192,7 +192,7 @@ void File_Area_Set_Sensitive (gboolean activate);
 void Tag_Area_Set_Sensitive  (gboolean activate);
 void Tag_Area_Display_Controls (ET_File *ETFile);
 
-void Read_Directory                   (gchar *path);
+gboolean Read_Directory               (gchar *path);
 void Quit_MainWindow                  (void);
 void MainWindow_Apply_Changes         (void);
 void Update_Command_Buttons_Sensivity (void);
diff --git a/src/et_core.c b/src/et_core.c
index 3240088..3240088 100755..100644
--- a/src/et_core.c
+++ b/src/et_core.c
diff --git a/src/et_core.h b/src/et_core.h
index ccc7f76..6836656 100755..100644
--- a/src/et_core.h
+++ b/src/et_core.h
@@ -242,6 +242,7 @@ static const ET_File_Description ETFileDescription[] =
 #endif
 #ifdef ENABLE_OGG
     {OGG_FILE,     ".ogg",  OGG_TAG},
+    {OGG_FILE,     ".oga",  OGG_TAG},
 #endif
 #ifdef ENABLE_SPEEX
     {SPEEX_FILE,   ".spx",  OGG_TAG},  // Implemented by Pierre Dumuid
diff --git a/src/id3_tag.c b/src/id3_tag.c
index 9092fee..9092fee 100755..100644
--- a/src/id3_tag.c
+++ b/src/id3_tag.c
diff --git a/src/id3lib/Makefile.in b/src/id3lib/Makefile.in
index 6eea830..9e89aa5 100644
--- a/src/id3lib/Makefile.in
+++ b/src/id3lib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -51,33 +47,33 @@ 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. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(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 --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+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 --mode=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 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+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@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -115,8 +111,10 @@ 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@
@@ -130,11 +128,11 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
 OBJEXT = @OBJEXT@
 OGG_CFLAGS = @OGG_CFLAGS@
 OGG_LIBS = @OGG_LIBS@
@@ -162,17 +160,13 @@ VORBIS_LIBS = @VORBIS_LIBS@
 WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+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_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -184,28 +178,39 @@ 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@
 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_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libid3bugfix.a
 INCLUDES = -DLOCALE=\"$(localedir)\"
 EXTRA_DIST = \
@@ -265,22 +270,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c_wrapper.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -291,10 +296,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -344,22 +345,21 @@ 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)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -407,7 +407,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -421,12 +421,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 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
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -447,19 +455,22 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-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-exec \
-	install-exec-am install-info install-info-am install-man \
+	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 \
-	uninstall-info-am
+	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.
diff --git a/src/id3v24_tag.c b/src/id3v24_tag.c
index d15bfec..d1302ca 100755..100644
--- a/src/id3v24_tag.c
+++ b/src/id3v24_tag.c
@@ -79,8 +79,8 @@ static int    libid3tag_Get_Frame_Str   (const struct id3_frame *frame, unsigned
 
 static void   Id3tag_delete_frames      (struct id3_tag *tag, const gchar *name, int start);
 static void   Id3tag_delete_txxframes   (struct id3_tag *tag, const gchar *param1, int start);
-static struct id3_frame *Id3tag_findncreate_frame     (struct id3_tag *tag, const gchar *name);
-static struct id3_frame *Id3tag_findncreate_txxframe  (struct id3_tag *tag, const gchar *param1);
+static struct id3_frame *Id3tag_find_and_create_frame    (struct id3_tag *tag, const gchar *name);
+static struct id3_frame *Id3tag_find_and_create_txxframe (struct id3_tag *tag, const gchar *param1);
 static int    id3taglib_set_field       (struct id3_frame *frame, const gchar *str, enum id3_field_type type, int num, int clear, int id3v1);
 static int    etag_set_tags             (const gchar *str, const char *frame_name, enum id3_field_type field_type, struct id3_tag *v1tag, struct id3_tag *v2tag, gboolean *strip_tags);
 static int    etag_write_tags           (const gchar *filename, const struct id3_tag *v1tag, const struct id3_tag *v2tag, gboolean strip_tags);
@@ -359,21 +359,24 @@ gboolean Id3tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     if ( (frame = id3_tag_findframe(tag, "WXXX", 0)) )
         update |= libid3tag_Get_Frame_Str(frame, EASYTAG_ID3_FIELD_LATIN1, &FileTag->url);
 
-    /*********************
-     * Encoded by (TENC) *
-     *********************/
+    /*******************************
+     * Encoded by (TENC) or (TXXX) *
+     *******************************/
     if ( (frame = id3_tag_findframe(tag, "TENC", 0)) )
         update |= libid3tag_Get_Frame_Str(frame, ~0, &FileTag->encoded_by);
+    
     /* Encoded by in TXXX frames */
     string1 = NULL;
     for (i = 0; (frame = id3_tag_findframe(tag, "TXX", i)); i++)
     {
+        // Do nothing if already read...
         if (FileTag->encoded_by)
             break;
+        
         tmpupdate = libid3tag_Get_Frame_Str(frame, ~0, &string1);
         if (string1)
         {
-            if (strcasestr(string1, EASYTAG_STRING_ENCODEDBY MULTIFIELD_SEPARATOR) == string1)
+            if (strncasecmp(string1, EASYTAG_STRING_ENCODEDBY MULTIFIELD_SEPARATOR, strlen(EASYTAG_STRING_ENCODEDBY MULTIFIELD_SEPARATOR)) == 0)
             {
                 FileTag->encoded_by = g_strdup(&string1[sizeof(EASYTAG_STRING_ENCODEDBY) + sizeof(MULTIFIELD_SEPARATOR) - 2]);
                 g_free(string1);
@@ -937,13 +940,15 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile)
     /***************
      * Encoded by  *
      ***************/
-    if ( v2tag && FileTag->encoded_by && *FileTag->encoded_by
-    && (frame = Id3tag_findncreate_txxframe(v2tag, EASYTAG_STRING_ENCODEDBY)))
-    {
-        id3taglib_set_field(frame, EASYTAG_STRING_ENCODEDBY, ID3_FIELD_TYPE_STRING, 0, 1, 0);
-        id3taglib_set_field(frame, FileTag->encoded_by, ID3_FIELD_TYPE_STRING, 1, 0, 0);
-        strip_tags = FALSE;
-    }else
+    //if ( v2tag && FileTag->encoded_by && *FileTag->encoded_by
+    //&& (frame = Id3tag_find_and_create_txxframe(v2tag, EASYTAG_STRING_ENCODEDBY)))
+    //{
+    //    id3taglib_set_field(frame, EASYTAG_STRING_ENCODEDBY, ID3_FIELD_TYPE_STRING, 0, 1, 0);
+    //    id3taglib_set_field(frame, FileTag->encoded_by, ID3_FIELD_TYPE_STRING, 1, 0, 0);
+    //    strip_tags = FALSE;
+    //}else
+    // Save encoder name in TENC frame instead of the TXX frame
+    etag_set_tags(FileTag->encoded_by, "TENC", ID3_FIELD_TYPE_STRINGLIST, NULL, v2tag, &strip_tags);
     if (v2tag)
         Id3tag_delete_txxframes(v2tag, EASYTAG_STRING_ENCODEDBY, 0);
 
@@ -1062,7 +1067,7 @@ Id3tag_delete_txxframes(struct id3_tag *tag, const gchar *param1, int start)
         {
             str = NULL;
             if ((str = (gchar *)id3_ucs4_latin1duplicate(ucs4string))
-            && (strcasestr(str, param1) == str) )
+            && (strncasecmp(str, param1, strlen(param1)) == 0) )
             {
                 g_free(str);
                 id3_tag_detachframe(tag, frame);
@@ -1080,7 +1085,7 @@ Id3tag_delete_txxframes(struct id3_tag *tag, const gchar *param1, int start)
  * create new if not found
  */
 static struct id3_frame *
-Id3tag_findncreate_frame(struct id3_tag *tag, const gchar *name)
+Id3tag_find_and_create_frame (struct id3_tag *tag, const gchar *name)
 {
     struct id3_frame *frame;
 
@@ -1103,7 +1108,7 @@ Id3tag_findncreate_frame(struct id3_tag *tag, const gchar *name)
  * create new if not found
  */
 static struct id3_frame *
-Id3tag_findncreate_txxframe(struct id3_tag *tag, const gchar *param1)
+Id3tag_find_and_create_txxframe(struct id3_tag *tag, const gchar *param1)
 {
     const id3_ucs4_t *ucs4string;
     struct id3_frame *frame;
@@ -1120,7 +1125,7 @@ Id3tag_findncreate_txxframe(struct id3_tag *tag, const gchar *param1)
     {
         str = NULL;
         if ((str = (gchar *)id3_ucs4_latin1duplicate(ucs4string))
-        && (strcasestr(str, param1) == str) )
+        && (strncasecmp(str, param1, strlen(param1)) == 0) )
         {
             g_free(str);
             break;
@@ -1320,10 +1325,10 @@ etag_set_tags(const gchar *str,
         *strip_tags = FALSE;
 
         if (v2tag
-        && (ftmp = Id3tag_findncreate_frame(v2tag, frame_name)))
+        && (ftmp = Id3tag_find_and_create_frame(v2tag, frame_name)))
             id3taglib_set_field(ftmp, str, field_type, 0, 1, 0);
         if (v1tag
-        && (ftmp = Id3tag_findncreate_frame(v1tag, frame_name)))
+        && (ftmp = Id3tag_find_and_create_frame(v1tag, frame_name)))
             id3taglib_set_field(ftmp, str, field_type, 0, 1, 1);
     }else
         if (v2tag)
diff --git a/src/libapetag/Makefile.in b/src/libapetag/Makefile.in
index 68858ad..1c5dda8 100644
--- a/src/libapetag/Makefile.in
+++ b/src/libapetag/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -52,25 +48,24 @@ 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. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=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 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+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@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -108,8 +103,10 @@ 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@
@@ -123,11 +120,11 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
 OBJEXT = @OBJEXT@
 OGG_CFLAGS = @OGG_CFLAGS@
 OGG_LIBS = @OGG_LIBS@
@@ -155,17 +152,13 @@ VORBIS_LIBS = @VORBIS_LIBS@
 WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+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_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -177,28 +170,39 @@ 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@
 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_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libapetag.a
 INCLUDES = -DLOCALE=\"$(localedir)\"
 libapetag_a_SOURCES = \
@@ -270,22 +274,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/is_tag.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -296,10 +300,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -349,22 +349,21 @@ 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)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -412,7 +411,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -426,12 +425,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 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
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -452,19 +459,22 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-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-exec \
-	install-exec-am install-info install-info-am install-man \
+	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 \
-	uninstall-info-am
+	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.
diff --git a/src/libmpg123/Makefile.in b/src/libmpg123/Makefile.in
index 203fdc7..801b487 100644
--- a/src/libmpg123/Makefile.in
+++ b/src/libmpg123/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -53,25 +49,24 @@ 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. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=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 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+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@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -109,8 +104,10 @@ 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@
@@ -124,11 +121,11 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
 OBJEXT = @OBJEXT@
 OGG_CFLAGS = @OGG_CFLAGS@
 OGG_LIBS = @OGG_LIBS@
@@ -156,17 +153,13 @@ VORBIS_LIBS = @VORBIS_LIBS@
 WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+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_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -178,28 +171,39 @@ 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@
 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_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libmpg123.a
 INCLUDES = -DLOCALE=\"$(localedir)\"
 libmpg123_a_SOURCES = \
@@ -275,22 +279,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpg123.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -301,10 +305,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -354,22 +354,21 @@ 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)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -417,7 +416,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -431,12 +430,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 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
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -457,19 +464,22 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-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-exec \
-	install-exec-am install-info install-info-am install-man \
+	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 \
-	uninstall-info-am
+	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.
diff --git a/src/log.c b/src/log.c
index 0dfc39b..155d753 100755..100644
--- a/src/log.c
+++ b/src/log.c
@@ -28,6 +28,7 @@
 #include "log.h"
 #include "easytag.h"
 #include "bar.h"
+#include "setting.h"
 
 #ifdef WIN32
 #   include "win32/win32dep.h"
@@ -41,6 +42,7 @@
 GtkWidget    *LogList          = NULL;
 GtkListStore *logListModel;
 GList        *LogPrintTmpList  = NULL; // Temporary list to store messages for the LogList when this control wasn't yet created
+gint          LogListNbrRows;
 
 enum
 {
@@ -142,8 +144,9 @@ GtkWidget *Create_Log_Area (void)
     // Load pending messages in the Log list
     Log_Print_Tmp_List();
 
-    //gtk_widget_show_all(ScrollWindowLogList);
-    gtk_widget_show_all(Frame);
+    if (SHOW_LOG_VIEW)
+        //gtk_widget_show_all(ScrollWindowLogList);
+        gtk_widget_show_all(Frame);
 
     //return ScrollWindowLogList;
     return Frame;
@@ -190,7 +193,10 @@ void Log_List_Set_Row_Visible (GtkTreeModel *treeModel, GtkTreeIter *rowIter)
 void Log_Clean_Log_List (void)
 {
     if (logListModel)
+    {
         gtk_list_store_clear(logListModel);
+        LogListNbrRows = 0;
+    }
 }
 
 
@@ -236,6 +242,15 @@ void Log_Print (gchar const *format, ...)
     if (LogList && logListModel)
     {
         gchar *time = Log_Format_Date();
+
+        // Remove lines that exceed the limit
+        if (LogListNbrRows > LOG_MAX_LINES - 1
+        &&  gtk_tree_model_get_iter_first(GTK_TREE_MODEL(logListModel), &iter))
+        {
+            gtk_list_store_remove(GTK_LIST_STORE(logListModel), &iter);         
+        }
+        
+        LogListNbrRows++;
         gtk_list_store_append(logListModel, &iter);
         gtk_list_store_set(logListModel, &iter,
                            LOG_TIME_TEXT, time,
@@ -296,6 +311,7 @@ void Log_Print_Tmp_List (void)
         
         if (LogList && logListModel)
         {
+            LogListNbrRows++;
             gtk_list_store_append(logListModel, &iter);
             gtk_list_store_set(logListModel, &iter,
                                LOG_TIME_TEXT, ((Log_Data *)LogPrintTmpList->data)->time,
diff --git a/src/misc.c b/src/misc.c
index 41f12ec..9346abe 100755..100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -173,12 +173,15 @@ void Button_Load_Set_Sensivity              (GtkWidget *button, GtkWidget *entry
 GtkWidget *Create_Load_Filename_Popup_Menu     (GtkWidget *list);
 void Load_Filename_List_Insert_Blank_Line      (GtkWidget *list);
 void Load_Filename_List_Delete_Line            (GtkWidget *list);
+void Load_Filename_List_Move_Up                (GtkWidget *list);
+void Load_Filename_List_Move_Down              (GtkWidget *list);
 void Load_Filename_List_Delete_All_Blank_Lines (GtkWidget *list);
 void Load_Filename_List_Reload                 (GtkWidget *list);
 void Load_Filename_Update_Text_Line            (GtkWidget *entry, GtkWidget *list);
 void Load_Filename_Edit_Text_Line              (GtkTreeSelection *selection, gpointer data);
 
-void Create_Xpm_Icon_Factory (const char **xpmdata, const char *name);
+void Create_Xpm_Icon_Factory (const char **xpm_data, const char *name_in_factory);
+void Create_Png_Icon_Factory (const char *png_file, const char *name_in_factory);
 
 /* Browser */
 static void Open_File_Selection_Window (GtkWidget *entry, gchar *title, GtkFileChooserAction action);
@@ -684,8 +687,8 @@ void Set_Unbusy_Cursor (void)
 #include "../pixmaps/forbidden.xpm"
 #include "../pixmaps/read_only.xpm"
 //#include "../pixmaps/sequence_track.xpm"
-#include "../pixmaps/red_lines.xpm"
 #include "../pixmaps/artist_album.xpm"
+#include "../pixmaps/red_lines.xpm"
 #include "../pixmaps/add_folder.xpm"
 #include "../pixmaps/parent_folder.xpm"
 #include "../pixmaps/sound.xpm"
@@ -697,6 +700,7 @@ void Init_Custom_Icons (void)
 {
     Create_Xpm_Icon_Factory((const char**)select_all_xpm, "easytag-select-all");
     Create_Xpm_Icon_Factory((const char**)scan_xpm, "easytag-scan");
+    ////Create_Png_Icon_Factory("scan.png", "easytag-scan");
     Create_Xpm_Icon_Factory((const char**)invert_selection_xpm, "easytag-invert-selection");
     Create_Xpm_Icon_Factory((const char**)add_xpm, "easytag-add");
     Create_Xpm_Icon_Factory((const char**)unselect_all_xpm, "easytag-unselect-all");
@@ -708,6 +712,7 @@ void Init_Custom_Icons (void)
     //Create_Xpm_Icon_Factory((const char**)sequence_track_xpm, "easytag-sequence-track");
     Create_Xpm_Icon_Factory((const char**)red_lines_xpm, "easytag-red-lines");
     Create_Xpm_Icon_Factory((const char**)artist_album_xpm, "easytag-artist-album");
+    ////Create_Png_Icon_Factory("artist_album.png", "easytag-artist-album");
     Create_Xpm_Icon_Factory((const char**)parent_folder_xpm, "easytag-parent-folder");
     Create_Xpm_Icon_Factory((const char**)add_folder_xpm, "easytag-add-folder");
     Create_Xpm_Icon_Factory((const char**)sound_xpm, "easytag-sound");
@@ -722,22 +727,62 @@ void Init_Custom_Icons (void)
  * Create an icon factory from the specified pixmap
  * Also add it to the GTK stock images
  */
-void Create_Xpm_Icon_Factory (const char **xpmdata, const char *xpmname)
+void Create_Xpm_Icon_Factory (const char **xpm_data, const char *name_in_factory)
 {
-    GtkIconSet *set;
-    GtkIconFactory *factory;
-    GdkPixbuf *pixbuf;
+    GtkIconSet      *icon;
+    GtkIconFactory  *factory;
+    GdkPixbuf       *pixbuf;
 
-    if (!*xpmdata || !xpmname)
+    if (!*xpm_data || !name_in_factory)
         return;
 
-    pixbuf = gdk_pixbuf_new_from_xpm_data(xpmdata);
+    pixbuf = gdk_pixbuf_new_from_xpm_data(xpm_data);
 
-    set = gtk_icon_set_new_from_pixbuf(pixbuf);
-    factory = gtk_icon_factory_new();
-    gtk_icon_factory_add(factory, xpmname, set);
-    gtk_icon_set_unref(set);
-    gtk_icon_factory_add_default(factory);
+    if (pixbuf)
+    {
+        icon = gtk_icon_set_new_from_pixbuf(pixbuf);
+        g_object_unref(G_OBJECT(pixbuf));
+
+        factory = gtk_icon_factory_new();
+        gtk_icon_factory_add(factory, name_in_factory, icon);
+        gtk_icon_set_unref(icon);
+        gtk_icon_factory_add_default(factory);
+    }
+}
+
+/*
+ * Create an icon factory from the specified png file
+ * Also add it to the GTK stock images
+ */
+void Create_Png_Icon_Factory (const char *png_file, const char *name_in_factory)
+{
+    GdkPixbuf       *pixbuf;
+    GtkIconSet      *icon;
+    GtkIconFactory  *factory;
+    gchar           *path;
+    GError          *error = NULL;
+    
+    if (!*png_file || !name_in_factory)
+        return;
+
+    path = g_strconcat(PACKAGE_DATA_DIR,"/",png_file,NULL);
+    pixbuf = gdk_pixbuf_new_from_file(path,&error);
+    g_free(path);
+    
+    if (pixbuf)
+    {
+        icon = gtk_icon_set_new_from_pixbuf(pixbuf);
+        g_object_unref(G_OBJECT(pixbuf));
+
+        factory = gtk_icon_factory_new();
+        gtk_icon_factory_add(factory, name_in_factory, icon);
+        gtk_icon_set_unref(icon);
+        gtk_icon_factory_add_default(factory);
+    }else
+    {
+        Log_Print(error->message);
+        g_error_free(error);
+    }
 }
 
 /*
@@ -1443,7 +1488,7 @@ void Open_Write_Playlist_Window (void)
     gtk_box_set_spacing(GTK_BOX(ButtonBox), 10);
 
     /* Button to Cancel */
-    Button = Create_Button_With_Pixmap(BUTTON_CLOSE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
     gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
     GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
     gtk_widget_grab_default(Button);
@@ -1468,10 +1513,6 @@ void Destroy_Write_Playlist_Window (void)
 {
     if (WritePlaylistWindow)
     {
-        /* Save combobox history lists before exit */
-        Save_Play_List_Name_List(PlayListNameMaskModel, MISC_COMBO_TEXT);
-        Save_Playlist_Content_Mask_List(PlayListContentMaskModel, MISC_COMBO_TEXT);
-
         Write_Playlist_Window_Apply_Changes();
 
         gtk_widget_destroy(WritePlaylistWindow);
@@ -1515,8 +1556,13 @@ void Write_Playlist_Window_Apply_Changes (void)
         PLAYLIST_CONTENT_NONE         = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(playlist_content_none));
         PLAYLIST_CONTENT_FILENAME     = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(playlist_content_filename));
         PLAYLIST_CONTENT_MASK         = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(playlist_content_mask));
+        
         if (PLAYLIST_CONTENT_MASK_VALUE) g_free(PLAYLIST_CONTENT_MASK_VALUE);
         PLAYLIST_CONTENT_MASK_VALUE   = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_BIN(PlayListContentMaskCombo)->child)));
+
+        /* Save combobox history lists before exit */
+        Save_Play_List_Name_List(PlayListNameMaskModel, MISC_COMBO_TEXT);
+        Save_Playlist_Content_Mask_List(PlayListContentMaskModel, MISC_COMBO_TEXT);
     }
 }
 
@@ -2189,7 +2235,7 @@ void Open_Search_File_Window (void)
             "changed", G_CALLBACK(Search_Result_List_Row_Selected), NULL);
 
     // Button to run the search
-    Button = Create_Button_With_Pixmap(BUTTON_SEARCH);
+    Button = gtk_button_new_from_stock(GTK_STOCK_FIND);
     gtk_table_attach(GTK_TABLE(Table),Button,5,6,0,1,GTK_FILL,GTK_FILL,0,0);
     GTK_WIDGET_SET_FLAGS(Button,GTK_CAN_DEFAULT);
     gtk_widget_grab_default(Button);
@@ -2197,7 +2243,7 @@ void Open_Search_File_Window (void)
     g_signal_connect(G_OBJECT(GTK_BIN(SearchStringCombo)->child),"activate", G_CALLBACK(Search_File),NULL);
 
     // Button to cancel
-    Button = Create_Button_With_Pixmap(BUTTON_CLOSE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
     gtk_table_attach(GTK_TABLE(Table),Button,5,6,1,2,GTK_FILL,GTK_FILL,0,0);
     g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(Destroy_Search_File_Window),NULL);
 
@@ -2670,6 +2716,7 @@ void Open_Load_Filename_Window (void)
     GtkWidget *Label;
     GtkWidget *ButtonBox;
     GtkWidget *Button;
+    GtkWidget *Icon;
     GtkWidget *Entry;
     GtkWidget *ButtonLoad;
     GtkWidget *Separator;
@@ -2746,38 +2793,104 @@ void Open_Load_Filename_Window (void)
     Separator = gtk_hseparator_new();
     gtk_box_pack_start(GTK_BOX(VBox),Separator,FALSE,FALSE,0);
 
+    //
+    // Vbox for loaded files
+    //
     loadedvbox = gtk_vbox_new(FALSE, 4);
 
-    // Label of file content
-    Label = gtk_label_new(_("Loaded File Content :"));
-    gtk_box_pack_start(GTK_BOX(loadedvbox), Label, FALSE, FALSE, 0);
-
     // Content of the loaded file
     ScrollWindow = gtk_scrolled_window_new(NULL,NULL);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ScrollWindow),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
     gtk_widget_set_size_request(GTK_WIDGET(ScrollWindow), 250, 200);
+    gtk_box_pack_start(GTK_BOX(loadedvbox), ScrollWindow, TRUE, TRUE, 0);
     LoadFileContentListModel = gtk_list_store_new(LOAD_FILE_CONTENT_COUNT, G_TYPE_STRING);
     LoadFileContentList = gtk_tree_view_new_with_model(GTK_TREE_MODEL(LoadFileContentListModel));
+    
     renderer = gtk_cell_renderer_text_new();
-    column = gtk_tree_view_column_new_with_attributes("",
-            renderer, "text", LOAD_FILE_CONTENT_TEXT, NULL);
+    column = gtk_tree_view_column_new_with_attributes(_("Content of TXT file"),
+                                                      renderer, "text", LOAD_FILE_CONTENT_TEXT, NULL);
     gtk_tree_view_append_column(GTK_TREE_VIEW(LoadFileContentList), column);
-    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(LoadFileContentList), FALSE);
+    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(LoadFileContentList), TRUE);
+    //gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(LoadFileContentList)),GTK_SELECTION_MULTIPLE);
+    gtk_tree_view_set_reorderable(GTK_TREE_VIEW(LoadFileContentList),TRUE);
     gtk_container_add(GTK_CONTAINER(ScrollWindow),LoadFileContentList);
-    gtk_box_pack_start(GTK_BOX(loadedvbox), ScrollWindow, TRUE, TRUE, 0);
 
     // Signal to automatically load the file
     g_signal_connect_swapped(G_OBJECT(ButtonLoad),"clicked", G_CALLBACK(Load_File_Content), G_OBJECT(GTK_BIN(FileToLoadCombo)->child));
     g_signal_connect(G_OBJECT(LoadFileContentList),"key-press-event", G_CALLBACK(Load_Filename_List_Key_Press),NULL);
 
+    // Commands (like the popup menu)
+    hbox = gtk_hbox_new(FALSE,4);
+    gtk_box_pack_start(GTK_BOX(loadedvbox),hbox,FALSE,FALSE,0);
+
+    Button = gtk_button_new();
+    Icon = gtk_image_new_from_stock(GTK_STOCK_ADD,GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_container_add(GTK_CONTAINER(Button),Icon);
+    gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
+    //gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+    gtk_tooltips_set_tip(Tips,Button,_("Insert a blank line before the selected line"),NULL);
+    g_signal_connect_swapped(G_OBJECT(Button),"clicked",
+                             G_CALLBACK(Load_Filename_List_Insert_Blank_Line), G_OBJECT(LoadFileContentList));
+
+    Button = gtk_button_new();
+    Icon = gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_container_add(GTK_CONTAINER(Button),Icon);
+    gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
+    //gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+    gtk_tooltips_set_tip(Tips,Button,_("Delete the selected line"),NULL);
+    g_signal_connect_swapped(G_OBJECT(Button),"clicked",
+                             G_CALLBACK(Load_Filename_List_Delete_Line), G_OBJECT(LoadFileContentList));
+    
+    Button = gtk_button_new();
+    Icon = gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_container_add(GTK_CONTAINER(Button),Icon);
+    gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
+    //gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+    gtk_tooltips_set_tip(Tips,Button,_("Delete all blank lines"),NULL);
+    g_signal_connect_swapped(G_OBJECT(Button),"clicked",
+                             G_CALLBACK(Load_Filename_List_Delete_All_Blank_Lines), G_OBJECT(LoadFileContentList));
+    
+    Label = gtk_label_new("   ");
+    gtk_box_pack_start(GTK_BOX(hbox),Label,FALSE,FALSE,0);
+
+    Button = gtk_button_new();
+    Icon = gtk_image_new_from_stock(GTK_STOCK_GO_UP, GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_container_add(GTK_CONTAINER(Button),Icon);
+    gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
+    //gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+    gtk_tooltips_set_tip(Tips,Button,_("Move up the selected line"),NULL);
+    g_signal_connect_swapped(G_OBJECT(Button),"clicked",
+                             G_CALLBACK(Load_Filename_List_Move_Up), G_OBJECT(LoadFileContentList));
+
+    Button = gtk_button_new();
+    Icon = gtk_image_new_from_stock(GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_container_add(GTK_CONTAINER(Button),Icon);
+    gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
+    //gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+    gtk_tooltips_set_tip(Tips,Button,_("Move down the selected line"),NULL);
+    g_signal_connect_swapped(G_OBJECT(Button),"clicked",
+                             G_CALLBACK(Load_Filename_List_Move_Down), G_OBJECT(LoadFileContentList));
+
+    Label = gtk_label_new("   ");
+    gtk_box_pack_start(GTK_BOX(hbox),Label,FALSE,FALSE,0);
+
+    Button = gtk_button_new();
+    Icon = gtk_image_new_from_stock(GTK_STOCK_REFRESH,GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_container_add(GTK_CONTAINER(Button),Icon);
+    gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
+    //gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+    gtk_tooltips_set_tip(Tips,Button,_("Reload"),NULL);
+    g_signal_connect_swapped(G_OBJECT(Button),"clicked",
+                             G_CALLBACK(Load_Filename_List_Reload), G_OBJECT(LoadFileContentList));
+    
     gtk_widget_show_all(loadedvbox);
 
+    
+    //
+    // Vbox for file list files
+    //
     filelistvbox = gtk_vbox_new(FALSE, 4);
 
-    // Label of current list
-    Label = gtk_label_new(_("Files Name List :"));
-    gtk_box_pack_start(GTK_BOX(filelistvbox), Label, FALSE, FALSE, 0);
-
     // List of current filenames
     ScrollWindow = gtk_scrolled_window_new(NULL,NULL);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ScrollWindow),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
@@ -2785,10 +2898,14 @@ void Open_Load_Filename_Window (void)
     gtk_box_pack_start(GTK_BOX(filelistvbox), ScrollWindow, TRUE, TRUE, 0);
     LoadFileNameListModel = gtk_list_store_new(LOAD_FILE_NAME_COUNT, G_TYPE_STRING,G_TYPE_POINTER);
     LoadFileNameList = gtk_tree_view_new_with_model(GTK_TREE_MODEL(LoadFileNameListModel));
+    
     renderer = gtk_cell_renderer_text_new();
-    column = gtk_tree_view_column_new_with_attributes("", renderer, "text", LOAD_FILE_NAME_TEXT, NULL);
+    column = gtk_tree_view_column_new_with_attributes(_("List of files"), 
+                                                      renderer, "text", LOAD_FILE_NAME_TEXT, NULL);
     gtk_tree_view_append_column(GTK_TREE_VIEW(LoadFileNameList), column);
-    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(LoadFileNameList), FALSE);
+    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(LoadFileNameList), TRUE);
+    //gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(LoadFileNameList)),GTK_SELECTION_MULTIPLE);
+    gtk_tree_view_set_reorderable(GTK_TREE_VIEW(LoadFileNameList),TRUE);
     g_signal_connect(G_OBJECT(LoadFileNameList),"key-press-event", G_CALLBACK(Load_Filename_List_Key_Press),NULL);
     gtk_container_add(GTK_CONTAINER(ScrollWindow),LoadFileNameList);
 
@@ -2796,8 +2913,73 @@ void Open_Load_Filename_Window (void)
     g_signal_connect_swapped(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(LoadFileContentList))),"changed", G_CALLBACK(Load_Filename_Select_Row_In_Other_List), G_OBJECT(LoadFileNameList));
     g_signal_connect_swapped(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(LoadFileNameList))),"changed", G_CALLBACK(Load_Filename_Select_Row_In_Other_List), G_OBJECT(LoadFileContentList));
 
+    // Commands (like the popup menu)
+    hbox = gtk_hbox_new(FALSE,4);
+    gtk_box_pack_start(GTK_BOX(filelistvbox),hbox,FALSE,FALSE,0);
+
+    Button = gtk_button_new();
+    Icon = gtk_image_new_from_stock(GTK_STOCK_ADD,GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_container_add(GTK_CONTAINER(Button),Icon);
+    gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
+    //gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+    gtk_tooltips_set_tip(Tips,Button,_("Insert a blank line before the selected line"),NULL);
+    g_signal_connect_swapped(G_OBJECT(Button),"clicked",
+                             G_CALLBACK(Load_Filename_List_Insert_Blank_Line), G_OBJECT(LoadFileNameList));
+
+    Button = gtk_button_new();
+    Icon = gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_container_add(GTK_CONTAINER(Button),Icon);
+    gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
+    //gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+    gtk_tooltips_set_tip(Tips,Button,_("Delete the selected line"),NULL);
+    g_signal_connect_swapped(G_OBJECT(Button),"clicked",
+                             G_CALLBACK(Load_Filename_List_Delete_Line), G_OBJECT(LoadFileNameList));
+
+    Button = gtk_button_new();
+    Icon = gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_container_add(GTK_CONTAINER(Button),Icon);
+    gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
+    //gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+    gtk_tooltips_set_tip(Tips,Button,_("Delete all blank lines"),NULL);
+    g_signal_connect_swapped(G_OBJECT(Button),"clicked",
+                             G_CALLBACK(Load_Filename_List_Delete_All_Blank_Lines), G_OBJECT(LoadFileNameList));
+    
+    Label = gtk_label_new("   ");
+    gtk_box_pack_start(GTK_BOX(hbox),Label,FALSE,FALSE,0);
+
+    Button = gtk_button_new();
+    Icon = gtk_image_new_from_stock(GTK_STOCK_GO_UP, GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_container_add(GTK_CONTAINER(Button),Icon);
+    gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
+    //gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+    gtk_tooltips_set_tip(Tips,Button,_("Move up the selected line"),NULL);
+    g_signal_connect_swapped(G_OBJECT(Button),"clicked",
+                             G_CALLBACK(Load_Filename_List_Move_Up), G_OBJECT(LoadFileNameList));
+
+    Button = gtk_button_new();
+    Icon = gtk_image_new_from_stock(GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_container_add(GTK_CONTAINER(Button),Icon);
+    gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
+    //gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+    gtk_tooltips_set_tip(Tips,Button,_("Move down the selected line"),NULL);
+    g_signal_connect_swapped(G_OBJECT(Button),"clicked",
+                             G_CALLBACK(Load_Filename_List_Move_Down), G_OBJECT(LoadFileNameList));
+
+    Label = gtk_label_new("   ");
+    gtk_box_pack_start(GTK_BOX(hbox),Label,FALSE,FALSE,0);
+
+    Button = gtk_button_new();
+    Icon = gtk_image_new_from_stock(GTK_STOCK_REFRESH,GTK_ICON_SIZE_SMALL_TOOLBAR);
+    gtk_container_add(GTK_CONTAINER(Button),Icon);
+    gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
+    //gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+    gtk_tooltips_set_tip(Tips,Button,_("Reload"),NULL);
+    g_signal_connect_swapped(G_OBJECT(Button),"clicked",
+                             G_CALLBACK(Load_Filename_List_Reload), G_OBJECT(LoadFileNameList));
+    
     gtk_widget_show_all(filelistvbox);
 
+    
     // Load the list of files in the list widget
     Load_File_List();
 
@@ -2810,9 +2992,15 @@ void Open_Load_Filename_Window (void)
     Create_Load_Filename_Popup_Menu(LoadFileContentList);
     Create_Load_Filename_Popup_Menu(LoadFileNameList);
 
+    hbox = gtk_hbox_new(FALSE,4);
+    gtk_box_pack_start(GTK_BOX(VBox),hbox,FALSE,TRUE,0);
+
+    Label = gtk_label_new(_("Selected line:"));
+    gtk_box_pack_start(GTK_BOX(hbox),Label,FALSE,FALSE,0);
+
     // Entry to edit a line into the list
     Entry = gtk_entry_new();
-    gtk_box_pack_start(GTK_BOX(VBox),Entry,FALSE,TRUE,0);
+    gtk_box_pack_start(GTK_BOX(hbox),Entry,TRUE,TRUE,0);
     g_signal_connect(G_OBJECT(Entry),"changed",G_CALLBACK(Load_Filename_Update_Text_Line),G_OBJECT(LoadFileContentList));
 
     // Signal to load the line text in the editing entry
@@ -2838,14 +3026,14 @@ void Open_Load_Filename_Window (void)
     gtk_box_set_spacing(GTK_BOX(ButtonBox), 10);
 
     // Button to cancel
-    Button = Create_Button_With_Pixmap(BUTTON_CLOSE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
     gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
     GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
     gtk_widget_grab_default(Button);
     g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(Destroy_Load_Filename_Window),NULL);
 
     // Button to load filenames
-    Button = Create_Button_With_Pixmap(BUTTON_APPLY);
+    Button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
     gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
     GTK_WIDGET_SET_FLAGS(Button,GTK_CAN_DEFAULT);
     g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(Load_Filename_Set_Filenames),NULL);
@@ -3146,11 +3334,13 @@ void Load_Filename_Set_Filenames (void)
 
         found = gtk_tree_model_get_iter(GTK_TREE_MODEL(LoadFileNameListModel), &iter_name, currentPath);
         if (found)
-            gtk_tree_model_get(GTK_TREE_MODEL(LoadFileNameListModel), &iter_name, LOAD_FILE_NAME_POINTER, &ETFile, -1);
+            gtk_tree_model_get(GTK_TREE_MODEL(LoadFileNameListModel), &iter_name, 
+                               LOAD_FILE_NAME_POINTER, &ETFile, -1);
 
         found = gtk_tree_model_get_iter(GTK_TREE_MODEL(LoadFileContentListModel), &iter_content, currentPath);
         if (found)
-            gtk_tree_model_get(GTK_TREE_MODEL(LoadFileContentListModel), &iter_content, LOAD_FILE_CONTENT_TEXT, &list_text, -1);
+            gtk_tree_model_get(GTK_TREE_MODEL(LoadFileContentListModel), &iter_content, 
+                               LOAD_FILE_CONTENT_TEXT, &list_text, -1);
 
         if (ETFile && list_text && g_utf8_strlen(list_text, -1)>0)
         {
@@ -3207,8 +3397,9 @@ GtkWidget *Create_Load_Filename_Popup_Menu(GtkWidget *list)
 
 
     BrowserPopupMenu = gtk_menu_new();
-    g_signal_connect_swapped(G_OBJECT(list),"button_press_event", G_CALLBACK(Load_Filename_Popup_Menu_Handler), G_OBJECT(BrowserPopupMenu));
-
+    g_signal_connect_swapped(G_OBJECT(list), "button_press_event", 
+                             G_CALLBACK(Load_Filename_Popup_Menu_Handler), G_OBJECT(BrowserPopupMenu));
+    
     MenuItem = gtk_image_menu_item_new_with_label(_("Insert a blank line"));
     Image = gtk_image_new_from_stock(GTK_STOCK_ADD,GTK_ICON_SIZE_MENU);
     gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(MenuItem),Image);
@@ -3230,6 +3421,21 @@ GtkWidget *Create_Load_Filename_Popup_Menu(GtkWidget *list)
     MenuItem = gtk_menu_item_new();
     gtk_menu_shell_append(GTK_MENU_SHELL(BrowserPopupMenu),MenuItem);
 
+    MenuItem = gtk_image_menu_item_new_with_label(_("Move up this line"));
+    Image = gtk_image_new_from_stock(GTK_STOCK_GO_UP,GTK_ICON_SIZE_MENU);
+    gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(MenuItem),Image);
+    gtk_menu_shell_append(GTK_MENU_SHELL(BrowserPopupMenu),MenuItem);
+    g_signal_connect_swapped(G_OBJECT(MenuItem),"activate", G_CALLBACK(Load_Filename_List_Move_Up),G_OBJECT(list));
+
+    MenuItem = gtk_image_menu_item_new_with_label(_("Move down this line"));
+    Image = gtk_image_new_from_stock(GTK_STOCK_GO_DOWN,GTK_ICON_SIZE_MENU);
+    gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(MenuItem),Image);
+    gtk_menu_shell_append(GTK_MENU_SHELL(BrowserPopupMenu),MenuItem);
+    g_signal_connect_swapped(G_OBJECT(MenuItem),"activate", G_CALLBACK(Load_Filename_List_Move_Down),G_OBJECT(list));
+
+    MenuItem = gtk_menu_item_new();
+    gtk_menu_shell_append(GTK_MENU_SHELL(BrowserPopupMenu),MenuItem);
+
     MenuItem = gtk_image_menu_item_new_with_label(_("Reload"));
     Image = gtk_image_new_from_stock(GTK_STOCK_REFRESH,GTK_ICON_SIZE_MENU);
     gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(MenuItem),Image);
@@ -3243,7 +3449,7 @@ GtkWidget *Create_Load_Filename_Popup_Menu(GtkWidget *list)
 /*
  * Insert a blank line before the selected line in the treeview passed as parameter
  */
-void Load_Filename_List_Insert_Blank_Line(GtkWidget *treeview)
+void Load_Filename_List_Insert_Blank_Line (GtkWidget *treeview)
 {
     GtkTreeSelection *selection;
     GtkTreeIter selectedIter;
@@ -3262,7 +3468,7 @@ void Load_Filename_List_Insert_Blank_Line(GtkWidget *treeview)
 }
 
 /*
- * Delete all blank lines in the treeview passed in as parameter
+ * Delete all blank lines in the treeview passed as parameter
  */
 void Load_Filename_List_Delete_All_Blank_Lines (GtkWidget *treeview)
 {
@@ -3297,9 +3503,9 @@ void Load_Filename_List_Delete_All_Blank_Lines (GtkWidget *treeview)
 }
 
 /*
- * Delete the selected line in the treeview passed in as parameter
+ * Delete the selected line in the treeview passed as parameter
  */
-void Load_Filename_List_Delete_Line(GtkWidget *treeview)
+void Load_Filename_List_Delete_Line (GtkWidget *treeview)
 {
     GtkTreeSelection *selection;
     GtkTreeIter selectedIter, itercopy;
@@ -3327,6 +3533,109 @@ void Load_Filename_List_Delete_Line(GtkWidget *treeview)
 }
 
 /*
+ * Move up the selected line in the treeview passed as parameter
+ */
+void Load_Filename_List_Move_Up (GtkWidget *treeview)
+{
+    GtkTreeSelection *selection;
+    GList *selectedRows;
+    GList *selectedRowsCopy;
+    GtkTreeIter currentFile;
+    GtkTreeIter nextFile;
+    GtkTreePath *currentPath;
+    GtkTreeModel *treemodel;
+    gboolean valid;
+
+    if (!treeview) return;
+
+    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
+    treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
+    selectedRows = gtk_tree_selection_get_selected_rows(selection, NULL);
+
+    if (g_list_length(selectedRows) == 0)
+    {
+        g_list_foreach(selectedRows, (GFunc)gtk_tree_path_free, NULL);
+        g_list_free(selectedRows);
+        return;
+    }
+
+    selectedRowsCopy = selectedRows;
+
+    while (selectedRows)
+    {
+        currentPath = (GtkTreePath*) selectedRows->data;
+        valid = gtk_tree_model_get_iter(treemodel, &currentFile, currentPath);
+        if (valid)
+        {
+            // Find the entry above the node...
+            if (gtk_tree_path_prev(currentPath))
+            {
+                // ...and if it exists, swap the two rows by iter
+                gtk_tree_model_get_iter(treemodel, &nextFile, currentPath);
+                gtk_list_store_swap(GTK_LIST_STORE(treemodel), &currentFile, &nextFile);
+            }
+        }
+
+        selectedRows = selectedRows->next;
+        if (!selectedRows) break;
+    }
+
+    g_list_foreach(selectedRowsCopy, (GFunc)gtk_tree_path_free, NULL);
+    g_list_free(selectedRowsCopy);
+    
+}
+
+/*
+ * Move down the selected line in the treeview passed as parameter
+ */
+void Load_Filename_List_Move_Down (GtkWidget *treeview)
+{
+    GtkTreeSelection *selection;
+    GList *selectedRows;
+    GList *selectedRowsCopy;
+    GtkTreeIter currentFile;
+    GtkTreeIter nextFile;
+    GtkTreePath *currentPath;
+    GtkTreeModel *treemodel;
+    gboolean valid;
+
+    if (!treeview) return;
+
+    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
+    treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
+    selectedRows = gtk_tree_selection_get_selected_rows(selection, NULL);
+
+    if (g_list_length(selectedRows) == 0)
+    {
+        g_list_foreach(selectedRows, (GFunc)gtk_tree_path_free, NULL);
+        g_list_free(selectedRows);
+        return;
+    }
+
+    selectedRowsCopy = selectedRows;
+
+    while (selectedRows)
+    {
+        currentPath = (GtkTreePath*) selectedRows->data;
+        valid = gtk_tree_model_get_iter(treemodel, &currentFile, currentPath);
+        if (valid)
+        {
+            // Find the entry below the node and swap the two nodes by iter
+            gtk_tree_path_next(currentPath);
+            if (gtk_tree_model_get_iter(treemodel, &nextFile, currentPath))
+                gtk_list_store_swap(GTK_LIST_STORE(treemodel), &currentFile, &nextFile);
+        }
+
+        if (!selectedRows->next) break;
+        selectedRows = selectedRows->next;
+    }
+
+    g_list_foreach(selectedRowsCopy, (GFunc)gtk_tree_path_free, NULL);
+    g_list_free(selectedRowsCopy);
+    
+}
+
+/*
  * Reload a list of choice
  * The list parameter refers to a GtkTreeView (LoadFileNameList or LoadFileContentList)
  */
@@ -3337,6 +3646,7 @@ void Load_Filename_List_Reload (GtkWidget *treeview)
     if (GTK_TREE_VIEW(treeview) == (GtkTreeView *)LoadFileContentList)
     {
         Load_File_Content(GTK_BIN(FileToLoadCombo)->child);
+        
     } else if (GTK_TREE_VIEW(treeview) == (GtkTreeView *)LoadFileNameList)
     {
         Load_File_List();
diff --git a/src/msgbox.c b/src/msgbox.c
index 3099e50..f9a8cb7 100755..100644
--- a/src/msgbox.c
+++ b/src/msgbox.c
@@ -184,7 +184,7 @@ GtkWidget *msg_box_new (gchar *title, gchar *message, const gchar *stock_id,
     gtk_container_add(GTK_CONTAINER(GTK_DIALOG(mb)->action_area),ButtonBox);
 
     /* Read buttons from variable arguments */
-    va_start (cursor,stock_id);
+    va_start(cursor,stock_id);
     while ( (cursor_value = va_arg(cursor,gint)) != 0 )
     {
         Button = Create_Button_With_Pixmap(cursor_value);
diff --git a/src/msgbox.h b/src/msgbox.h
index 6b5d663..6b5d663 100755..100644
--- a/src/msgbox.h
+++ b/src/msgbox.h
diff --git a/src/picture.c b/src/picture.c
index 8dd7b37..4f9edae 100755..100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -731,7 +731,8 @@ void Picture_Save_Button_Clicked (GObject *object)
 
                 msg = g_strdup_printf(_("The following file already exists :\n'%s'\n"
                     "Do you want to overwrite?"),filename_utf8);
-                msgbox = msg_box_new(_("Save file..."),msg,GTK_STOCK_DIALOG_QUESTION,BUTTON_NO,BUTTON_YES,0);
+                msgbox = msg_box_new(_("Save file..."),msg,
+                                     GTK_STOCK_DIALOG_QUESTION,BUTTON_NO,BUTTON_YES,0);
                 g_free(msg);
                 msg_box_hide_check_button(MSG_BOX(msgbox));
                 button = msg_box_run(MSG_BOX(msgbox));
@@ -984,7 +985,7 @@ void PictureEntry_Update (Picture *pic, gint select)
                     "has been read to determine how to create the image buffer."));
                 Log_Print("%s",msg);
                 msgbox = msg_box_new(_("Loading Picture File..."),msg,
-                    GTK_STOCK_DIALOG_ERROR,BUTTON_YES,0);
+                                     GTK_STOCK_DIALOG_ERROR,BUTTON_YES,0);
                 msg_box_hide_check_button(MSG_BOX(msgbox));
                 g_free(msg);
                 msg_box_run(MSG_BOX(msgbox));
diff --git a/src/prefs.c b/src/prefs.c
index 485e35f..7e862d9 100755..100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -407,6 +407,38 @@ void Open_OptionsWindow (void)
     g_signal_connect_swapped(G_OBJECT(Button),"clicked",
         G_CALLBACK(File_Selection_Window_For_File), G_OBJECT(GTK_BIN(FilePlayerCombo)->child));
 
+    /* Log options */
+    Frame = gtk_frame_new (_("Log Options"));
+    gtk_box_pack_start(GTK_BOX(VBox),Frame,FALSE,FALSE,0);
+    vbox = gtk_vbox_new(FALSE,2);
+    gtk_container_add(GTK_CONTAINER(Frame),vbox);
+    gtk_container_set_border_width(GTK_CONTAINER(vbox), 2);
+
+    // Show / hide log view
+    ShowLogView = gtk_check_button_new_with_label(_("Show log view in main window"));
+    gtk_box_pack_start(GTK_BOX(vbox),ShowLogView,FALSE,FALSE,0);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ShowLogView),SHOW_LOG_VIEW);
+    gtk_tooltips_set_tip(Tips,ShowLogView,_("If activated, the log view would be "
+                                            "visible in the main window."),NULL);
+   
+    // Max number of lines
+    hbox = gtk_hbox_new(FALSE,2);
+    gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,0);
+    gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
+    Label = gtk_label_new (_("Max number of lines :"));
+    gtk_box_pack_start(GTK_BOX(hbox),Label,FALSE,FALSE,0);
+    
+    LogMaxLinesSpinButton = gtk_spin_button_new((GtkAdjustment *)gtk_adjustment_new(2.0,2.0,6.0,1.0,1.0,1.0),1.0,0);
+    LogMaxLinesSpinButton = gtk_spin_button_new_with_range(10.0,1500.0,10.0);
+    gtk_box_pack_start(GTK_BOX(hbox),LogMaxLinesSpinButton,FALSE,FALSE,0);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(LogMaxLinesSpinButton),(gfloat)LOG_MAX_LINES);
+    //g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
+    //g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+/*    gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
+        "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
+        "to receive files as other arguments."),NULL);
+*/
+
 
 
     /*
@@ -883,6 +915,7 @@ void Open_OptionsWindow (void)
 
     Table = gtk_table_new(4,2,FALSE);
     gtk_box_pack_start(GTK_BOX(vbox),Table,FALSE,FALSE,0);
+    //gtk_container_set_border_width(GTK_CONTAINER(Table), 2);
     //gtk_table_set_row_spacings(GTK_TABLE(Table),2);
     gtk_table_set_col_spacings(GTK_TABLE(Table),2);
 
@@ -1137,7 +1170,7 @@ void Open_OptionsWindow (void)
     CddbServerCgiPathAutomaticSearch = gtk_entry_new();
     gtk_box_pack_start(GTK_BOX(hbox),CddbServerCgiPathAutomaticSearch,FALSE,FALSE,0);
     if (CDDB_SERVER_CGI_PATH_AUTOMATIC_SEARCH)
-        gtk_entry_set_text(GTK_ENTRY(CddbServerCgiPathAutomaticSearch) ,CDDB_SERVER_CGI_PATH_AUTOMATIC_SEARCH);
+        gtk_entry_set_text(GTK_ENTRY(CddbServerCgiPathAutomaticSearch),CDDB_SERVER_CGI_PATH_AUTOMATIC_SEARCH);
 
     // 2sd automatic search server
     hbox = gtk_hbox_new(FALSE,2);
@@ -1381,25 +1414,25 @@ void Open_OptionsWindow (void)
 
 
     /* Apply Button */
-    Button = Create_Button_With_Pixmap(BUTTON_APPLY);
+    Button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
     // 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);
+    ////g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
+    ////GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
     gtk_tooltips_set_tip(Tips,Button,_("Apply changes (but don't save) and close this window"),NULL);
 
 
     /* Cancel Button */
-    Button = Create_Button_With_Pixmap(BUTTON_CANCEL);
+    Button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
     gtk_container_add(GTK_CONTAINER(ButtonBox), Button);
     g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(OptionsWindow_Cancel_Button),NULL);
     GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-    gtk_widget_grab_default (Button);
+    gtk_widget_grab_default(Button);
     gtk_tooltips_set_tip(Tips,Button,_("Close this window without saving"),NULL);
 
 
     /* Save Button */
-    Button = Create_Button_With_Pixmap(BUTTON_SAVE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_OK);
     gtk_container_add(GTK_CONTAINER(ButtonBox), Button);
     g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(OptionsWindow_Save_Button),NULL);
     GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
@@ -1616,12 +1649,6 @@ void OptionsWindow_Quit(void)
 {
     if (OptionsWindow)
     {
-        /* Save combobox history lists before exit */
-        Save_Default_Path_To_MP3_List     (DefaultPathModel, MISC_COMBO_TEXT);
-        Save_Default_Tag_Comment_Text_List(DefaultCommentModel, MISC_COMBO_TEXT);
-        Save_Audio_File_Player_List       (FilePlayerModel, MISC_COMBO_TEXT);
-        Save_Cddb_Local_Path_List         (CddbLocalPathModel, MISC_COMBO_TEXT);
-
         OptionsWindow_Apply_Changes();
 
         /* Now quit */
@@ -1655,6 +1682,12 @@ void OptionsWindow_Apply_Changes (void)
 
         /* Get the last visible notebook page */
         OPTIONS_NOTEBOOK_PAGE = gtk_notebook_get_current_page(GTK_NOTEBOOK(OptionsNoteBook));
+
+        /* Save combobox history lists before exit */
+        Save_Default_Path_To_MP3_List     (DefaultPathModel, MISC_COMBO_TEXT);
+        Save_Default_Tag_Comment_Text_List(DefaultCommentModel, MISC_COMBO_TEXT);
+        Save_Audio_File_Player_List       (FilePlayerModel, MISC_COMBO_TEXT);
+        Save_Cddb_Local_Path_List         (CddbLocalPathModel, MISC_COMBO_TEXT);
     }
 }
 
diff --git a/src/prefs.h b/src/prefs.h
index b88eed1..5c1e122 100755..100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -111,6 +111,8 @@ GtkWidget *NumberTrackFormatedSpinButton;
 GtkWidget *OggTagWriteXmmsComment;
 GtkWidget *SetFocusToSameTagField;
 GtkWidget *SetFocusToFirstTagField;
+GtkWidget *LogMaxLinesSpinButton;
+GtkWidget *ShowLogView;
 
 
 /* Scanner */
diff --git a/src/scan.c b/src/scan.c
index ce080a0..a16adf9 100755..100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -234,7 +234,9 @@ void     Scan_Free_File_Fill_Tag_List         (GList *list);
 void     Scan_Rename_Directory_Generate_Preview (void);
 
 gchar  **Scan_Return_File_Tag_Field_From_Mask_Code (File_Tag *FileTag, gchar code);
-void     Scan_Process_Fields_Functions (gchar *string);
+void     Scan_Process_Fields_Functions (gchar **string);
+
+gint     Scan_Word_Is_Roman_Numeral (gchar *text);
 
 void Process_Fields_Check_Button_Toggled (GtkObject *object, GList *list);
 void Process_Fields_Convert_Check_Button_Toggled (GtkObject *object);
@@ -242,16 +244,17 @@ void Select_Fields_Invert_Selection    (void);
 void Select_Fields_Select_Unselect_All (void);
 void Select_Fields_Set_Sensitive       (void);
 
-void Mask_Editor_List_Row_Selected  (GtkTreeSelection* selection, gpointer data);
-void Mask_Editor_List_New           (void);
-void Mask_Editor_List_Duplicate     (void);
-void Mask_Editor_List_Add           (void);
-void Mask_Editor_List_Remove        (void);
-void Mask_Editor_List_Move_Up       (void);
-void Mask_Editor_List_Move_Down     (void);
-void Mask_Editor_List_Save_Button   (void);
-void Mask_Editor_Entry_Changed      (void);
-gboolean Mask_Editor_List_Key_Press (GtkWidget *widget, GdkEvent *event);
+void Mask_Editor_List_Row_Selected    (GtkTreeSelection* selection, gpointer data);
+void Mask_Editor_List_Set_Row_Visible (GtkTreeModel *treeModel, GtkTreeIter *rowIter);
+void Mask_Editor_List_New             (void);
+void Mask_Editor_List_Duplicate       (void);
+void Mask_Editor_List_Add             (void);
+void Mask_Editor_List_Remove          (void);
+void Mask_Editor_List_Move_Up         (void);
+void Mask_Editor_List_Move_Down       (void);
+void Mask_Editor_List_Save_Button     (void);
+void Mask_Editor_Entry_Changed        (void);
+gboolean Mask_Editor_List_Key_Press   (GtkWidget *widget, GdkEvent *event);
 
 void Mask_Editor_Clean_Up_Masks_List (void);
 
@@ -1067,18 +1070,14 @@ void Scan_Process_Fields (ET_File *ETFile)
     File_Name *st_filename;
     File_Tag  *st_filetag;
     gchar     *filename_utf8;
-    //GString *string2process;
-    guint  string_length;
-    gchar *string;
-    gchar *temp;
+    gchar     *string;
 
 
     if (!ScannerWindow || !ETFile) return;
 
-    st_filename      = (File_Name *)ETFile->FileNameNew->data;
-    st_filetag       = (File_Tag  *)ETFile->FileTag->data;
-    //string2process = g_string_sized_new(512);
-
+    st_filename = (File_Name *)ETFile->FileNameNew->data;
+    st_filetag  = (File_Tag  *)ETFile->FileTag->data;
+    
     /* Process the filename */
     if (st_filename != NULL)
     {
@@ -1092,17 +1091,11 @@ void Scan_Process_Fields (ET_File *ETFile)
             if (!FileName)
                 FileName = ET_File_Name_Item_New();
 
-            // FIX ME : we suppose that it will not grow more than 2 times its size...
-            temp = g_path_get_basename(filename_utf8);
-            string_length = 2 * g_utf8_strlen(temp,-1);
-            string        = g_malloc(string_length+1);
-            strncpy(string,temp,string_length);
-            g_free(temp);
-            string[string_length]='\0';
+            string = g_path_get_basename(filename_utf8);
             // Remove the extension to set it to lower case (to avoid problem with undo)
             if ((pos=strrchr(string,'.'))!=NULL) *pos = 0;
 
-            Scan_Process_Fields_Functions(string);
+            Scan_Process_Fields_Functions(&string);
 
             string_utf8 = ET_File_Name_Generate(ETFile,string);
             ET_Set_Filename_File_Name_Item(FileName,string_utf8,NULL);
@@ -1123,13 +1116,9 @@ void Scan_Process_Fields (ET_File *ETFile)
                 ET_Copy_File_Tag_Item(ETFile,FileTag);
             }
 
-            // FIX ME : we suppose that it will not grow more than 2 times its size...
-            string_length = 2 * strlen(st_filetag->title);
-            string        = g_malloc(string_length+1);
-            strncpy(string,st_filetag->title,string_length);
-            string[string_length]='\0';
+            string = g_strdup(st_filetag->title);
 
-            Scan_Process_Fields_Functions(string);
+            Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->title,string);
 
@@ -1145,13 +1134,9 @@ void Scan_Process_Fields (ET_File *ETFile)
                 ET_Copy_File_Tag_Item(ETFile,FileTag);
             }
 
-            // FIX ME : we suppose that it will not grow more than 2 times its size...
-            string_length = 2 * strlen(st_filetag->artist);
-            string        = g_malloc(string_length+1);
-            strncpy(string,st_filetag->artist,string_length);
-            string[string_length]='\0';
-
-            Scan_Process_Fields_Functions(string);
+            string = g_strdup(st_filetag->artist);
+            
+            Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->artist,string);
 
@@ -1167,13 +1152,9 @@ void Scan_Process_Fields (ET_File *ETFile)
                 ET_Copy_File_Tag_Item(ETFile,FileTag);
             }
 
-            // FIX ME : we suppose that it will not grow more than 2 times its size...
-            string_length = 2 * strlen(st_filetag->album);
-            string        = g_malloc(string_length+1);
-            strncpy(string,st_filetag->album,string_length);
-            string[string_length]='\0';
-
-            Scan_Process_Fields_Functions(string);
+            string = g_strdup(st_filetag->album);
+            
+            Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->album,string);
 
@@ -1189,13 +1170,9 @@ void Scan_Process_Fields (ET_File *ETFile)
                 ET_Copy_File_Tag_Item(ETFile,FileTag);
             }
 
-            // FIX ME : we suppose that it will not grow more than 2 times its size...
-            string_length = 2 * strlen(st_filetag->genre);
-            string        = g_malloc(string_length+1);
-            strncpy(string,st_filetag->genre,string_length);
-            string[string_length]='\0';
-
-            Scan_Process_Fields_Functions(string);
+            string = g_strdup(st_filetag->genre);
+            
+            Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->genre,string);
 
@@ -1211,13 +1188,9 @@ void Scan_Process_Fields (ET_File *ETFile)
                 ET_Copy_File_Tag_Item(ETFile,FileTag);
             }
 
-            // FIX ME : we suppose that it will not grow more than 2 times its size...
-            string_length = 2 * strlen(st_filetag->comment);
-            string        = g_malloc(string_length+1);
-            strncpy(string,st_filetag->comment,string_length);
-            string[string_length]='\0';
-
-            Scan_Process_Fields_Functions(string);
+            string = g_strdup(st_filetag->comment);
+            
+            Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->comment,string);
 
@@ -1233,13 +1206,9 @@ void Scan_Process_Fields (ET_File *ETFile)
                 ET_Copy_File_Tag_Item(ETFile,FileTag);
             }
 
-            // FIX ME : we suppose that it will not grow more than 2 times its size...
-            string_length = 2 * strlen(st_filetag->composer);
-            string        = g_malloc(string_length+1);
-            strncpy(string,st_filetag->composer,string_length);
-            string[string_length]='\0';
-
-            Scan_Process_Fields_Functions(string);
+            string = g_strdup(st_filetag->composer);
+            
+            Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->composer,string);
 
@@ -1255,13 +1224,9 @@ void Scan_Process_Fields (ET_File *ETFile)
                 ET_Copy_File_Tag_Item(ETFile,FileTag);
             }
 
-            // FIX ME : we suppose that it will not grow more than 2 times its size...
-            string_length = 2 * strlen(st_filetag->orig_artist);
-            string        = g_malloc(string_length+1);
-            strncpy(string,st_filetag->orig_artist,string_length);
-            string[string_length]='\0';
-
-            Scan_Process_Fields_Functions(string);
+            string = g_strdup(st_filetag->orig_artist);
+            
+            Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->orig_artist,string);
 
@@ -1277,13 +1242,9 @@ void Scan_Process_Fields (ET_File *ETFile)
                 ET_Copy_File_Tag_Item(ETFile,FileTag);
             }
 
-            // FIX ME : we suppose that it will not grow more than 2 times its size...
-            string_length = 2 * strlen(st_filetag->copyright);
-            string        = g_malloc(string_length+1);
-            strncpy(string,st_filetag->copyright,string_length);
-            string[string_length]='\0';
-
-            Scan_Process_Fields_Functions(string);
+            string = g_strdup(st_filetag->copyright);
+            
+            Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->copyright,string);
 
@@ -1299,13 +1260,9 @@ void Scan_Process_Fields (ET_File *ETFile)
                 ET_Copy_File_Tag_Item(ETFile,FileTag);
             }
 
-            // FIX ME : we suppose that it will not grow more than 2 times its size...
-            string_length = 2 * strlen(st_filetag->url);
-            string        = g_malloc(string_length+1);
-            strncpy(string,st_filetag->url,string_length);
-            string[string_length]='\0';
-
-            Scan_Process_Fields_Functions(string);
+            string = g_strdup(st_filetag->url);
+            
+            Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->url,string);
 
@@ -1321,13 +1278,9 @@ void Scan_Process_Fields (ET_File *ETFile)
                 ET_Copy_File_Tag_Item(ETFile,FileTag);
             }
 
-            // FIX ME : we suppose that it will not grow more than 2 times its size...
-            string_length = 2 * strlen(st_filetag->encoded_by);
-            string        = g_malloc(string_length+1);
-            strncpy(string,st_filetag->encoded_by,string_length);
-            string[string_length]='\0';
-
-            Scan_Process_Fields_Functions(string);
+            string = g_strdup(st_filetag->encoded_by);
+            
+            Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->encoded_by,string);
 
@@ -1346,51 +1299,50 @@ void Scan_Process_Fields (ET_File *ETFile)
 }
 
 
-void Scan_Process_Fields_Functions (gchar *string)
+void Scan_Process_Fields_Functions (gchar **string)
 {
-
     if (GTK_TOGGLE_BUTTON(ProcessFieldsConvertIntoSpace)->active)
     {
-        Scan_Convert_Underscore_Into_Space(string);
-        Scan_Convert_P20_Into_Space(string);
+        Scan_Convert_Underscore_Into_Space(*string);
+        Scan_Convert_P20_Into_Space(*string);
     }
 
     if (GTK_TOGGLE_BUTTON(ProcessFieldsConvertSpace)->active)
-        Scan_Convert_Space_Into_Undescore(string);
+        Scan_Convert_Space_Into_Undescore(*string);
 
     if (GTK_TOGGLE_BUTTON(ProcessFieldsInsertSpace)->active)
         Scan_Process_Fields_Insert_Space(string);
 
     if (GTK_TOGGLE_BUTTON(ProcessFieldsOnlyOneSpace)->active)
-        Scan_Process_Fields_Keep_One_Space(string);
+        Scan_Process_Fields_Keep_One_Space(*string);
 
     if (GTK_TOGGLE_BUTTON(ProcessFieldsConvert)->active)
-        Scan_Convert(string);
+        Scan_Convert_Character(string);
 
     if (GTK_TOGGLE_BUTTON(ProcessFieldsAllUppercase)->active)
-        Scan_Process_Fields_All_Uppercase(string);
+        Scan_Process_Fields_All_Uppercase(*string);
 
     if (GTK_TOGGLE_BUTTON(ProcessFieldsAllDowncase)->active)
-        Scan_Process_Fields_All_Downcase(string);
+        Scan_Process_Fields_All_Downcase(*string);
 
     if (GTK_TOGGLE_BUTTON(ProcessFieldsFirstLetterUppercase)->active)
-         Scan_Process_Fields_Letter_Uppercase(string);
+         Scan_Process_Fields_Letter_Uppercase(*string);
 
     if (GTK_TOGGLE_BUTTON(ProcessFieldsFirstLettersUppercase)->active)
-        Scan_Process_Fields_First_Letters_Uppercase(string);
+        Scan_Process_Fields_First_Letters_Uppercase(*string);
 
     if (GTK_TOGGLE_BUTTON(ProcessFieldsRemoveSpace)->active)
-        Scan_Process_Fields_Remove_Space(string);
+        Scan_Process_Fields_Remove_Space(*string);
 
 }
 
-void Scan_Process_Fields_All_Uppercase (gchar *text)
+void Scan_Process_Fields_All_Uppercase (gchar *string)
 {
     gchar *temp;
     gchar temp2[6]; // Must have at least 6 bytes of space
     gunichar c;
 
-    for (temp = text; *temp; temp = g_utf8_next_char(temp))
+    for (temp = string; *temp; temp = g_utf8_next_char(temp))
     {
         c = g_utf8_get_char(temp);
         if (g_unichar_islower(c))
@@ -1398,13 +1350,13 @@ void Scan_Process_Fields_All_Uppercase (gchar *text)
     }
 }
 
-void Scan_Process_Fields_All_Downcase (gchar *text)
+void Scan_Process_Fields_All_Downcase (gchar *string)
 {
     gchar *temp;
     gchar temp2[6];
     gunichar c;
 
-    for (temp = text; *temp; temp = g_utf8_next_char(temp))
+    for (temp = string; *temp; temp = g_utf8_next_char(temp))
     {
         c = g_utf8_get_char(temp);
         if (g_unichar_isupper(c))
@@ -1412,7 +1364,7 @@ void Scan_Process_Fields_All_Downcase (gchar *text)
     }
 }
 
-void Scan_Process_Fields_Letter_Uppercase (gchar *text)
+void Scan_Process_Fields_Letter_Uppercase (gchar *string)
 {
     gchar *temp;
     gchar temp2[6];
@@ -1421,7 +1373,7 @@ void Scan_Process_Fields_Letter_Uppercase (gchar *text)
     gchar utf8_character[6];
     gchar *word, *word1, *word2;
 
-    for (temp = text; *temp; temp = g_utf8_next_char(temp))
+    for (temp = string; *temp; temp = g_utf8_next_char(temp))
     {
         c = g_utf8_get_char(temp);
         if (set_to_upper_case && g_unichar_islower(c))
@@ -1431,11 +1383,12 @@ void Scan_Process_Fields_Letter_Uppercase (gchar *text)
         set_to_upper_case = FALSE; // After the first time, all will be down case
     }
 
-    temp = text;
+    temp = string;
 
     // Uppercase again the word 'I' in english
     while ( temp )
     {
+        word = temp; // Needed if there is only one word
         word1 = g_utf8_strchr(temp,-1,' ');
         word2 = g_utf8_strchr(temp,-1,'_');
 
@@ -1447,6 +1400,7 @@ void Scan_Process_Fields_Letter_Uppercase (gchar *text)
         else if (word2)
             word = word2;
         else
+            // Last word of the string
             break;
 
         // Go to first character of the word (char. after ' ' or '_')
@@ -1463,7 +1417,11 @@ void Scan_Process_Fields_Letter_Uppercase (gchar *text)
     }
 }
 
-void Scan_Process_Fields_First_Letters_Uppercase (gchar *text)
+/*
+ * Function to set the first letter of each word to uppercase, according the "Chicago Manual of Style"
+ * No needed to reallocate
+ */
+void Scan_Process_Fields_First_Letters_Uppercase (gchar *string)
 {
 /**** DANIEL TEST *****
     gchar *iter;
@@ -1487,31 +1445,35 @@ void Scan_Process_Fields_First_Letters_Uppercase (gchar *text)
 ****/
 /**** Barış Çiçek version ****/
     gchar *word, *word1, *word2, *temp;
-    gint i;
+    gint i, len;
     gchar utf8_character[6];
     gunichar c;
     gboolean set_to_upper_case, set_to_upper_case_tmp;
     // There have to be space at the end of words to seperate them from prefix
+    // Chicago Manual of Style "Heading caps" Capitalization Rules (CMS 1993, 282) (http://www.docstyles.com/cmscrib.htm#Note2)
     gchar *exempt[] =
     {
         "a ",       "a_",
+        "against ", "against_",
         "an ",      "an_",
         "and ",     "and_",
         "at ",      "at_",
+        "between ", "between_",
         "but ",     "but_",
-        "feat. ",   "feat._",
+        //"feat. ",   "feat._", // Removed by Slash Bunny
         "for ",     "for_",
         "in ",      "in_",
         "nor ",     "nor_",
         "of ",      "of_",
-        "off ",     "off_",
+        //"off ",     "off_",   // Removed by Slash Bunny
         "on ",      "on_",
         "or ",      "or_",
-        "over ",    "over_",
+        //"over ",    "over_",  // Removed by Slash Bunny
         "so ",      "so_",
         "the ",     "the_",
         "to ",      "to_",
         "with ",    "with_",
+        "yet ",     "yet_",
         NULL
     };
 
@@ -1519,25 +1481,33 @@ void Scan_Process_Fields_First_Letters_Uppercase (gchar *text)
     {
         exempt[0] = NULL;
     }
-    Scan_Process_Fields_All_Downcase(text);
+    Scan_Process_Fields_All_Downcase(string);
 
-    if (!g_utf8_validate(text,-1,NULL))
+    if (!g_utf8_validate(string,-1,NULL))
     {
         Log_Print("Scan_Process_Fields_First_Letters_Uppercase: Not a valid utf8! quiting");
         return;
     }
     // Removes trailing whitespace
-    text = g_strchomp(text);
+    string = g_strchomp(string);
 
-    temp = text;
+    temp = string;
 
-    // Set first character to uppercase
-    c = g_utf8_get_char(temp);
-    strncpy(text, utf8_character, g_unichar_to_utf8(g_unichar_toupper(c), utf8_character));
+    // If the word is a roman numeral, capitalize all of it
+    if ((len = Scan_Word_Is_Roman_Numeral(temp)))
+    {
+        strncpy(string, g_utf8_strup(temp, len), len);
+    } else
+    {
+        // Set first character to uppercase
+        c = g_utf8_get_char(temp);
+        strncpy(string, utf8_character, g_unichar_to_utf8(g_unichar_toupper(c), utf8_character));
+    }
 
     // Uppercase first character of each word, except for 'exempt[]' words lists
     while ( temp )
     {
+        word = temp; // Needed if there is only one word
         word1 = g_utf8_strchr(temp,-1,' ');
         word2 = g_utf8_strchr(temp,-1,'_');
 
@@ -1549,23 +1519,37 @@ void Scan_Process_Fields_First_Letters_Uppercase (gchar *text)
         else if (word2)
             word = word2;
         else
+        {
+            // Last word of the string: the first letter is always uppercase,
+            // even if it's in the exempt list. This is a Chicago Manual of Style rule.
+            // Last Word In String - Should Capitalize Regardless of Word (Chicago Manual of Style)
+            c = g_utf8_get_char(word);
+            strncpy(word, utf8_character, g_unichar_to_utf8(g_unichar_toupper(c), utf8_character));
             break;
+        }
 
         // Go to first character of the word (char. after ' ' or '_')
         word = word+1;
 
-        // Set uppercase the first character of this word
-        c = g_utf8_get_char(word);
-        strncpy(word, utf8_character, g_unichar_to_utf8(g_unichar_toupper(c), utf8_character));
-
-        // Set lowercase the first character of this word if found in the exempt words list
-        for (i=0; exempt[i]!=NULL; i++)
+        // If the word is a roman numeral, capitalize all of it
+        if ((len = Scan_Word_Is_Roman_Numeral(word)))
+        {
+            strncpy(word, g_utf8_strup(word, len), len);
+        } else
         {
-            if (g_ascii_strncasecmp(exempt[i], word, strlen(exempt[i])) == 0)
+            // Set uppercase the first character of this word
+            c = g_utf8_get_char(word);
+            strncpy(word, utf8_character, g_unichar_to_utf8(g_unichar_toupper(c), utf8_character));
+
+            // Set lowercase the first character of this word if found in the exempt words list
+            for (i=0; exempt[i]!=NULL; i++)
             {
-                c = g_utf8_get_char(word);
-                strncpy(word, utf8_character, g_unichar_to_utf8(g_unichar_tolower(c), utf8_character));
-                break;
+                if (g_ascii_strncasecmp(exempt[i], word, strlen(exempt[i])) == 0)
+                {
+                    c = g_utf8_get_char(word);
+                    strncpy(word, utf8_character, g_unichar_to_utf8(g_unichar_tolower(c), utf8_character));
+                    break;
+                }
             }
         }
 
@@ -1574,13 +1558,17 @@ void Scan_Process_Fields_First_Letters_Uppercase (gchar *text)
 
     // Uppercase letter placed after some characters like '(', '[', '{'
     set_to_upper_case = FALSE;
-    for (temp = text; *temp; temp = g_utf8_next_char(temp))
+    for (temp = string; *temp; temp = g_utf8_next_char(temp))
     {
         c = g_utf8_get_char(temp);
         set_to_upper_case_tmp = (  c == (gunichar)'('
                                 || c == (gunichar)'['
                                 || c == (gunichar)'{'
                                 || c == (gunichar)'"'
+                                || c == (gunichar)':'
+                                || c == (gunichar)'.'
+                                || c == (gunichar)'`'
+                                || c == (gunichar)'-'
                                 ) ? TRUE : FALSE;
 
         if (set_to_upper_case && g_unichar_islower(c))
@@ -1591,11 +1579,12 @@ void Scan_Process_Fields_First_Letters_Uppercase (gchar *text)
 
 }
 
-void Scan_Process_Fields_Remove_Space (gchar *text)
+void Scan_Process_Fields_Remove_Space (gchar *string)
 {
     gchar *tmp, *tmp1;
+    
+    tmp = tmp1 = string;
 
-    tmp = tmp1 = text;
     while (*tmp)
     {
         while (*tmp == ' ')
@@ -1606,14 +1595,28 @@ void Scan_Process_Fields_Remove_Space (gchar *text)
     *tmp1 = '\0';
 }
 
-void Scan_Process_Fields_Insert_Space (gchar *text)
+/*
+ * The function inserts a space before an uppercase letter
+ * It is needed to realloc the memory!
+ */
+void Scan_Process_Fields_Insert_Space (gchar **string)
 {
     gchar *iter;
     gunichar c;
     gint j;
-
-    // FIXME: try to use realloc
-    for (iter = g_utf8_next_char(text); *iter; iter = g_utf8_next_char(iter))    // i=1 to not consider first "uppercase" letter
+    guint string_length;
+    gchar *string1;
+    
+    // FIX ME : we suppose that it will not grow more than 2 times its size...
+    string_length = 2 * strlen(*string);
+    //string1 = g_realloc(*string, string_length+1);
+    string1       = g_malloc(string_length+1);
+    strncpy(string1,*string,string_length);
+    string1[string_length]='\0';
+    g_free(*string);
+    *string = string1;
+    
+    for (iter = g_utf8_next_char(*string); *iter; iter = g_utf8_next_char(iter)) // At start : g_utf8_next_char to not consider first "uppercase" letter
     {
         c = g_utf8_get_char(iter);
 
@@ -1626,10 +1629,16 @@ void Scan_Process_Fields_Insert_Space (gchar *text)
         }
     }
 }
-void Scan_Process_Fields_Keep_One_Space (gchar *text)
+
+/*
+ * The function removes the duplicated spaces
+ * No needed to reallocate
+ */
+void Scan_Process_Fields_Keep_One_Space (gchar *string)
 {
     gchar *tmp, *tmp1;
-    tmp = tmp1 = text;
+    
+    tmp = tmp1 = string;
 
     // Remove multiple consecutive underscores and spaces.
     while (*tmp1)
@@ -1647,6 +1656,7 @@ void Scan_Process_Fields_Keep_One_Space (gchar *text)
 
 /*
  * Function to replace underscore '_' by a space
+ * No needed to reallocate
  */
 void Scan_Convert_Underscore_Into_Space (gchar *string)
 {
@@ -1658,6 +1668,7 @@ void Scan_Convert_Underscore_Into_Space (gchar *string)
 
 /*
  * Function to replace %20 by a space
+ * No needed to reallocate
  */
 void Scan_Convert_P20_Into_Space (gchar *string)
 {
@@ -1675,6 +1686,7 @@ void Scan_Convert_P20_Into_Space (gchar *string)
 
 /*
  * Function to replace space by '_'
+ * No needed to reallocate
  */
 void Scan_Convert_Space_Into_Undescore (gchar *string)
 {
@@ -1688,17 +1700,113 @@ void Scan_Convert_Space_Into_Undescore (gchar *string)
  * Replace something with something else ;)
  * Currently this only works with one character for each
  */
-void Scan_Convert (gchar *string)
+void Scan_Convert_Character (gchar **string)
 {
-    gchar *tmp;
     gchar *from = gtk_editable_get_chars(GTK_EDITABLE(ProcessFieldsConvertFrom),0,-1 );
     gchar *to   = gtk_editable_get_chars(GTK_EDITABLE(ProcessFieldsConvertTo),0,-1 );
-
-    if ( from && to && strlen(from)>0 && strlen(to)>0 )
-        while ((tmp=strchr(string,*from))!=NULL)
-            *tmp = *to;
+    const gchar *s;
+    const gchar *current;
+    GSList *tokens_list, *list;
+    gchar  *token;
+    gint    n_tokens;
+    gchar **result;
+   
+    
+    tokens_list = NULL;
+    n_tokens = 0;
+    s = current = *string;
+    
+    // Find tokens
+    if (strlen(from) > 0)
+    {
+        while (s 
+        &&    *s != '\0'
+        &&    (s = g_strstr_len(current,strlen(current),from)) )
+        {
+            token = g_strndup(current, s - current);
+            tokens_list = g_slist_prepend(tokens_list, token);
+            n_tokens++;
+            current = s + strlen(from);
+        }
+        // For the last token
+        if (s == NULL)
+        {
+            token = g_strndup(current,strlen(current));
+            tokens_list = g_slist_prepend(tokens_list, token);
+            n_tokens++;
+        }
+    }else
+    {
+        // We search an empty string... we suppose it exists between each UTF-8 character
+        while (s 
+        &&    *s != '\0'
+        &&    (s = g_utf8_find_next_char(current,NULL)) )
+        {
+            token = g_strndup(current, s - current);
+            tokens_list = g_slist_prepend(tokens_list, token);
+            n_tokens++;
+            current = s;
+        }
+    }
+    
+    // Load the tokens list in an array for g_strjoinv
+    result = g_new (gchar *, n_tokens + 1);
+    result[n_tokens] = NULL;
+    for (list = tokens_list; list != NULL; list = list->next)
+        result[--n_tokens] = list->data;
+    g_slist_free(tokens_list);
+    
+    g_free(*string);
+    
+    // Join all the tokens with the 'to' separator
+    *string = g_strjoinv(to,result);
+
+    g_strfreev(result);
 }
 
+/*
+ * Quick roman numeral check (non-roman numerals may also return true)
+ * Patch from Slash Bunny (2007.08.12)
+ * (http://home.hiwaay.net/~lkseitz/math/roman/numerals.shtml)
+ *    I = 1    (one)
+ *    V = 5    (five)
+ *    X = 10   (ten)
+ *    L = 50   (fifty)
+ *    C = 100  (one hundred)
+ *    D = 500  (five hundred)
+ *    M = 1000 (one thousand)
+ */
+gint Scan_Word_Is_Roman_Numeral (gchar *text)
+{
+    gchar *tmp;
+    gint  len;
+
+    tmp = text;
+    len = 0;
+
+    while (*tmp)
+    {
+        if (*tmp == (gunichar)'i' || 
+            *tmp == (gunichar)'v' || 
+            *tmp == (gunichar)'x' || 
+            *tmp == (gunichar)'l' ||
+            *tmp == (gunichar)'c' ||
+            *tmp == (gunichar)'d' ||
+            *tmp == (gunichar)'m')
+        {
+            tmp++;
+            len++;
+        } else if (*tmp == ' ' || *tmp == '_')
+        {
+            return len;
+        } else
+        {
+            return 0;
+        }
+    }
+
+    return len;
+}
 
 
 /*
@@ -1830,13 +1938,16 @@ void Open_ScannerWindow (gint scanner_type)
     gtk_widget_set_size_request(ScannerOptionCombo, 160, -1);
 
     /* Option for Tag */
-    gtk_combo_box_append_text(GTK_COMBO_BOX(ScannerOptionCombo), _(Scanner_Option_Menu_Items[SCANNER_FILL_TAG]));
+    gtk_combo_box_append_text(GTK_COMBO_BOX(ScannerOptionCombo), 
+                              _(Scanner_Option_Menu_Items[SCANNER_FILL_TAG]));
 
     /* Option for FileName */
-    gtk_combo_box_append_text(GTK_COMBO_BOX(ScannerOptionCombo), _(Scanner_Option_Menu_Items[SCANNER_RENAME_FILE]));
+    gtk_combo_box_append_text(GTK_COMBO_BOX(ScannerOptionCombo), 
+                              _(Scanner_Option_Menu_Items[SCANNER_RENAME_FILE]));
 
     /* Option for ProcessFields */
-    gtk_combo_box_append_text(GTK_COMBO_BOX(ScannerOptionCombo), _(Scanner_Option_Menu_Items[SCANNER_PROCESS_FIELDS]));
+    gtk_combo_box_append_text(GTK_COMBO_BOX(ScannerOptionCombo), 
+                              _(Scanner_Option_Menu_Items[SCANNER_PROCESS_FIELDS]));
 
     // Selection of the item made at the end of the function
     gtk_tooltips_set_tip(Tips, EventBox, _("Select the type of scanner to use"), NULL);
@@ -2135,19 +2246,23 @@ void Open_ScannerWindow (gint scanner_type)
     gtk_box_pack_start(GTK_BOX(VBox),ProcessFieldsConvertIntoSpace,FALSE,FALSE,0);
     gtk_box_pack_start(GTK_BOX(VBox),ProcessFieldsConvertSpace,    FALSE,FALSE,0);
     hbox = gtk_hbox_new(FALSE,2);
+    gtk_box_pack_start(GTK_BOX(VBox),hbox,FALSE,FALSE,0);
     ProcessFieldsConvert          = gtk_check_button_new_with_label(_("Convert:"));  // Patch from Ben Hearsum, Oct. 3, 2003
     ProcessFieldsConvertTo        = gtk_entry_new();
     ProcessFieldsConvertLabelTo   = gtk_label_new(_("to: ")); // A "space" at the end to allow an other traduction for "to :" (needed in French!)
     ProcessFieldsConvertFrom      = gtk_entry_new();
-    gtk_entry_set_max_length(GTK_ENTRY(ProcessFieldsConvertTo), 1);
-    gtk_entry_set_max_length(GTK_ENTRY(ProcessFieldsConvertFrom), 1);
-    gtk_widget_set_size_request(ProcessFieldsConvertTo,40,-1);
-    gtk_widget_set_size_request(ProcessFieldsConvertFrom,40,-1);
+    //gtk_entry_set_max_length(GTK_ENTRY(ProcessFieldsConvertTo), 1); // Now, it isn't limited to one character
+    //gtk_entry_set_max_length(GTK_ENTRY(ProcessFieldsConvertFrom), 1);
+    gtk_widget_set_size_request(ProcessFieldsConvertTo,120,-1);
+    gtk_widget_set_size_request(ProcessFieldsConvertFrom,120,-1);
     gtk_box_pack_start(GTK_BOX(hbox),ProcessFieldsConvert,       FALSE,FALSE,0);
     gtk_box_pack_start(GTK_BOX(hbox),ProcessFieldsConvertFrom,   FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessFieldsConvertLabelTo,FALSE,FALSE,4);
+    gtk_box_pack_start(GTK_BOX(hbox),ProcessFieldsConvertLabelTo,FALSE,FALSE,0);
     gtk_box_pack_start(GTK_BOX(hbox),ProcessFieldsConvertTo,     FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(VBox),hbox,FALSE,FALSE,0);
+    if (PROCESS_FIELDS_CONVERT_FROM)
+        gtk_entry_set_text(GTK_ENTRY(ProcessFieldsConvertFrom),PROCESS_FIELDS_CONVERT_FROM);
+    if (PROCESS_FIELDS_CONVERT_TO)
+        gtk_entry_set_text(GTK_ENTRY(ProcessFieldsConvertTo),PROCESS_FIELDS_CONVERT_TO);
     /* List creation for check buttons in group */
     pf_cb_group1 = g_list_append (pf_cb_group1,ProcessFieldsConvertIntoSpace);
     pf_cb_group1 = g_list_append (pf_cb_group1,ProcessFieldsConvertSpace);
@@ -2168,7 +2283,8 @@ void Open_ScannerWindow (gint scanner_type)
     gtk_tooltips_set_tip(Tips,ProcessFieldsConvertSpace,
         _("The space character is replaced by one underscore character. "
           "Example, before: 'Text In An Entry', after: 'Text_In_An_Entry'."),NULL);
-    gtk_tooltips_set_tip(Tips,ProcessFieldsConvert,_("Replace a character by an other one."),NULL);
+    gtk_tooltips_set_tip(Tips,ProcessFieldsConvert,
+        _("Replace a string by an other one. Note that the search is case sensitive."),NULL);
 
     /* Separator line */
     Separator = gtk_hseparator_new();
@@ -2217,16 +2333,16 @@ void Open_ScannerWindow (gint scanner_type)
     gtk_box_pack_start(GTK_BOX(VBox),Separator,FALSE,FALSE,0);
 
     /* Group: insert/remove spaces */
-    ProcessFieldsRemoveSpace = gtk_check_button_new_with_label(_("Remove spaces"));
-    ProcessFieldsInsertSpace = gtk_check_button_new_with_label(_("Insert a space before an uppercase letter"));
+    ProcessFieldsRemoveSpace  = gtk_check_button_new_with_label(_("Remove spaces"));
+    ProcessFieldsInsertSpace  = gtk_check_button_new_with_label(_("Insert a space before an uppercase letter"));
     ProcessFieldsOnlyOneSpace = gtk_check_button_new_with_label(_("Remove duplicates of space or underscore"));
     gtk_box_pack_start(GTK_BOX(VBox),ProcessFieldsRemoveSpace,FALSE,FALSE,0);
     gtk_box_pack_start(GTK_BOX(VBox),ProcessFieldsInsertSpace,FALSE,FALSE,0);
     gtk_box_pack_start(GTK_BOX(VBox),ProcessFieldsOnlyOneSpace,FALSE,FALSE,0);
     /* List creation for check buttons in group */
-    pf_cb_group3 = g_list_append (pf_cb_group3,ProcessFieldsRemoveSpace);
-    pf_cb_group3 = g_list_append (pf_cb_group3,ProcessFieldsInsertSpace);
-    pf_cb_group3 = g_list_append (pf_cb_group3,ProcessFieldsOnlyOneSpace);
+    pf_cb_group3 = g_list_append(pf_cb_group3,ProcessFieldsRemoveSpace);
+    pf_cb_group3 = g_list_append(pf_cb_group3,ProcessFieldsInsertSpace);
+    pf_cb_group3 = g_list_append(pf_cb_group3,ProcessFieldsOnlyOneSpace);
     /* Toggled signals */
     g_signal_connect(G_OBJECT(ProcessFieldsRemoveSpace), "toggled",G_CALLBACK(Process_Fields_Check_Button_Toggled),pf_cb_group3);
     g_signal_connect(G_OBJECT(ProcessFieldsInsertSpace), "toggled",G_CALLBACK(Process_Fields_Check_Button_Toggled),pf_cb_group3);
@@ -2516,16 +2632,6 @@ void ScannerWindow_Quit (void)
 {
     if (ScannerWindow)
     {
-        if (SCAN_TAG_DEFAULT_MASK) g_free(SCAN_TAG_DEFAULT_MASK);
-        SCAN_TAG_DEFAULT_MASK = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_BIN(ScanTagMaskCombo)->child)));
-        Add_String_To_Combo_List(ScanTagListModel, SCAN_TAG_DEFAULT_MASK);
-        Save_Rename_File_Masks_List(ScanTagListModel, MASK_EDITOR_TEXT);
-
-        if (RENAME_FILE_DEFAULT_MASK) g_free(RENAME_FILE_DEFAULT_MASK);
-        RENAME_FILE_DEFAULT_MASK = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_BIN(RenameFileMaskCombo)->child)));
-        Add_String_To_Combo_List(RenameFileListModel, RENAME_FILE_DEFAULT_MASK);
-        Save_Rename_File_Masks_List(RenameFileListModel, MASK_EDITOR_TEXT);
-
         ScannerWindow_Apply_Changes();
 
         gtk_widget_destroy(ScannerWindow);
@@ -2587,6 +2693,11 @@ void ScannerWindow_Apply_Changes (void)
         PROCESS_COPYRIGHT_FIELD   = GTK_TOGGLE_BUTTON(ProcessCopyrightField)->active;
         PROCESS_URL_FIELD         = GTK_TOGGLE_BUTTON(ProcessURLField)->active;
         PROCESS_ENCODED_BY_FIELD  = GTK_TOGGLE_BUTTON(ProcessEncodedByField)->active;
+        
+        if (PROCESS_FIELDS_CONVERT_FROM) g_free(PROCESS_FIELDS_CONVERT_FROM);
+        PROCESS_FIELDS_CONVERT_FROM = g_strdup(gtk_entry_get_text(GTK_ENTRY(ProcessFieldsConvertFrom)));
+        if (PROCESS_FIELDS_CONVERT_TO) g_free(PROCESS_FIELDS_CONVERT_TO);
+        PROCESS_FIELDS_CONVERT_TO   = g_strdup(gtk_entry_get_text(GTK_ENTRY(ProcessFieldsConvertTo)));
 
         /* Group: convert one character */
         PF_CONVERT_INTO_SPACE     = GTK_TOGGLE_BUTTON(ProcessFieldsConvertIntoSpace)->active;
@@ -2600,9 +2711,21 @@ void ScannerWindow_Apply_Changes (void)
         PF_CONVERT_FIRST_LETTERS_UPPERCASE = GTK_TOGGLE_BUTTON(ProcessFieldsFirstLettersUppercase)->active;
 
         /* Group: remove/insert space */
-        PF_REMOVE_SPACE   = GTK_TOGGLE_BUTTON(ProcessFieldsConvertIntoSpace)->active;
-        PF_INSERT_SPACE   = GTK_TOGGLE_BUTTON(ProcessFieldsConvertSpace)->active;
+        PF_REMOVE_SPACE   = GTK_TOGGLE_BUTTON(ProcessFieldsRemoveSpace)->active;
+        PF_INSERT_SPACE   = GTK_TOGGLE_BUTTON(ProcessFieldsInsertSpace)->active;
         PF_ONLY_ONE_SPACE = GTK_TOGGLE_BUTTON(ProcessFieldsOnlyOneSpace)->active;
+
+        // Save default masks...
+        if (SCAN_TAG_DEFAULT_MASK) g_free(SCAN_TAG_DEFAULT_MASK);
+        SCAN_TAG_DEFAULT_MASK = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_BIN(ScanTagMaskCombo)->child)));
+        Add_String_To_Combo_List(ScanTagListModel, SCAN_TAG_DEFAULT_MASK);
+        Save_Rename_File_Masks_List(ScanTagListModel, MASK_EDITOR_TEXT);
+
+        if (RENAME_FILE_DEFAULT_MASK) g_free(RENAME_FILE_DEFAULT_MASK);
+        RENAME_FILE_DEFAULT_MASK = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_BIN(RenameFileMaskCombo)->child)));
+        Add_String_To_Combo_List(RenameFileListModel, RENAME_FILE_DEFAULT_MASK);
+        Save_Rename_File_Masks_List(RenameFileListModel, MASK_EDITOR_TEXT);
+
     }
 }
 
@@ -2701,7 +2824,7 @@ gboolean Scan_Check_Rename_File_Mask (GtkObject *widget_to_show_hide, GtkEntry *
     if (!mask || strlen(mask)<1)
         goto Bad_Mask;
 
-    // Since version 1.99.4, it is available!
+    // Since version 1.99.4, it is available! => OK
     /*if ( strchr(mask,G_DIR_SEPARATOR)!=NULL ) // Renaming directory is not yet available
         goto Bad_Mask;*/
     // Not a valid path....
@@ -3017,15 +3140,15 @@ void Mask_Editor_List_Duplicate (void)
     GList *selectedRows;
     GList *toInsert = NULL;
     GtkTreeSelection *selection;
-    GtkTreeIter row;
-    GtkTreeModel *treemodel;
+    GtkTreeIter rowIter;
+    GtkTreeModel *treeModel;
     gboolean valid;
 
     if (!MaskEditorList) return;
 
     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(MaskEditorList));
     selectedRows = gtk_tree_selection_get_selected_rows(selection, NULL);
-    treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
+    treeModel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
 
     if (g_list_length(selectedRows) == 0)
     {
@@ -3035,14 +3158,15 @@ void Mask_Editor_List_Duplicate (void)
         return;
     }
 
-    /* Loop through selected rows, duplicating them into a GList */
-    /* We cannot directly insert because the paths in selectedRows get out of date after an insertion */
-    while(selectedRows)
+    /* Loop through selected rows, duplicating them into a GList
+     * We cannot directly insert because the paths in selectedRows 
+     * get out of date after an insertion */
+    while (selectedRows)
     {
-        valid = gtk_tree_model_get_iter(treemodel, &row, (GtkTreePath*) selectedRows->data);
+        valid = gtk_tree_model_get_iter(treeModel, &rowIter, (GtkTreePath*) selectedRows->data);
         if (valid)
         {
-            gtk_tree_model_get(treemodel, &row, MASK_EDITOR_TEXT, &text, -1);
+            gtk_tree_model_get(treeModel, &rowIter, MASK_EDITOR_TEXT, &text, -1);
             toInsert = g_list_append(toInsert, text);
         }
 
@@ -3050,18 +3174,22 @@ void Mask_Editor_List_Duplicate (void)
         if (!selectedRows) break;
     }
 
-    /* Duplicate the relevant entries, by looping through the list backwards (to preserve original order) */
+    /* Duplicate the relevant entries, by looping through the list backwards 
+     * (to preserve original order) */
     toInsert = g_list_last(toInsert);
-    while(toInsert)
+    while (toInsert)
     {
-        gtk_list_store_insert(GTK_LIST_STORE(treemodel), &row, 0);
-        gtk_list_store_set(GTK_LIST_STORE(treemodel), &row, MASK_EDITOR_TEXT, (gchar*) toInsert->data, -1);
+        gtk_list_store_insert(GTK_LIST_STORE(treeModel), &rowIter, 0);
+        gtk_list_store_set(GTK_LIST_STORE(treeModel), &rowIter, MASK_EDITOR_TEXT, (gchar*) toInsert->data, -1);
         g_free(toInsert->data);
 
         toInsert = toInsert->prev;
         if (!toInsert) break;
     }
-
+    // Set focus to the last inserted line
+    if (toInsert)
+        Mask_Editor_List_Set_Row_Visible(treeModel,&rowIter);
+        
     /* Free data no longer needed */
     selectedRows = g_list_first(selectedRows);
     toInsert = g_list_first(toInsert);
@@ -3071,7 +3199,7 @@ void Mask_Editor_List_Duplicate (void)
     g_list_free(toInsert);
 }
 
-void Mask_Editor_List_Add(void)
+void Mask_Editor_List_Add (void)
 {
     gint i = 0;
     GtkTreeIter iter;
@@ -3183,14 +3311,15 @@ void Mask_Editor_List_Move_Up (void)
 
     selectedRowsCopy = selectedRows;
 
-    while(selectedRows)
+    while (selectedRows)
     {
         currentPath = (GtkTreePath*) selectedRows->data;
         valid = gtk_tree_model_get_iter(treemodel, &currentFile, currentPath);
         if (valid)
         {
             /* Find the entry above the node... */
-            if (gtk_tree_path_prev(currentPath)) {
+            if (gtk_tree_path_prev(currentPath))
+            {
                 /* ...and if it exists, swap the two rows by iter */
                 gtk_tree_model_get_iter(treemodel, &nextFile, currentPath);
                 gtk_list_store_swap(GTK_LIST_STORE(treemodel), &currentFile, &nextFile);
@@ -3225,7 +3354,8 @@ void Mask_Editor_List_Move_Down (void)
     treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
     selectedRows = gtk_tree_selection_get_selected_rows(selection, NULL);
 
-    if (g_list_length(selectedRows) == 0) {
+    if (g_list_length(selectedRows) == 0)
+    {
         Log_Print(_("Move Down: No row selected!"));
         g_list_foreach(selectedRows, (GFunc)gtk_tree_path_free, NULL);
         g_list_free(selectedRows);
@@ -3242,8 +3372,8 @@ void Mask_Editor_List_Move_Down (void)
         {
             /* Find the entry below the node and swap the two nodes by iter */
             gtk_tree_path_next(currentPath);
-            gtk_tree_model_get_iter(treemodel, &nextFile, currentPath);
-            gtk_list_store_swap(GTK_LIST_STORE(treemodel), &currentFile, &nextFile);
+            if (gtk_tree_model_get_iter(treemodel, &nextFile, currentPath))
+                gtk_list_store_swap(GTK_LIST_STORE(treemodel), &currentFile, &nextFile);
         }
 
         if (!selectedRows->next) break;
@@ -3255,6 +3385,25 @@ void Mask_Editor_List_Move_Down (void)
 }
 
 /*
+ * Set a row visible in the mask editor list (by scrolling the list)
+ */
+void Mask_Editor_List_Set_Row_Visible (GtkTreeModel *treeModel, GtkTreeIter *rowIter)
+{
+    /*
+     * TODO: Make this only scroll to the row if it is not visible
+     * (like in easytag GTK1)
+     * See function gtk_tree_view_get_visible_rect() ??
+     */
+    GtkTreePath *rowPath;
+
+    if (!treeModel) return;
+
+    rowPath = gtk_tree_model_get_path(treeModel, rowIter);
+    gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(MaskEditorList), rowPath, NULL, FALSE, 0, 0);
+    gtk_tree_path_free(rowPath);
+}
+
+/*
  * Save the currently displayed mask list in the mask editor
  */
 void Mask_Editor_List_Save_Button (void)
diff --git a/src/scan.h b/src/scan.h
index 3173aa3..de151a2 100755..100644
--- a/src/scan.h
+++ b/src/scan.h
@@ -67,18 +67,18 @@ void   Scan_Use_Process_Fields_Scanner      (void);
 
 gboolean Scan_Check_Rename_File_Mask (GtkObject *widget_to_show_hide, GtkEntry *widget_source);
 
-void Scan_Process_Fields_All_Uppercase           (gchar *text);
-void Scan_Process_Fields_All_Downcase            (gchar *text);
-void Scan_Process_Fields_Letter_Uppercase        (gchar *text);
-void Scan_Process_Fields_First_Letters_Uppercase (gchar *text);
-void Scan_Process_Fields_Remove_Space            (gchar *text);
-void Scan_Process_Fields_Insert_Space            (gchar *text);
-void Scan_Process_Fields_Keep_One_Space          (gchar *text);
+void Scan_Process_Fields_All_Uppercase           (gchar *string);
+void Scan_Process_Fields_All_Downcase            (gchar *string);
+void Scan_Process_Fields_Letter_Uppercase        (gchar *string);
+void Scan_Process_Fields_First_Letters_Uppercase (gchar *string);
+void Scan_Process_Fields_Remove_Space            (gchar *string);
+void Scan_Process_Fields_Insert_Space            (gchar **string);
+void Scan_Process_Fields_Keep_One_Space          (gchar *string);
 
 void Scan_Convert_Underscore_Into_Space (gchar *string);
 void Scan_Convert_P20_Into_Space        (gchar *string);
 void Scan_Convert_Space_Into_Undescore  (gchar *string);
-void Scan_Convert                       (gchar *string);
+void Scan_Convert_Character             (gchar **string);
 
 void Init_ScannerWindow (void);
 void Open_ScannerWindow (gint scanner_type);
diff --git a/src/setting.c b/src/setting.c
index 93d11a3..9b00a32 100755..100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -138,6 +138,8 @@ tConfigVariable Config_Variables[] =
     {"set_focus_to_first_tag_field",         CV_TYPE_BOOL,    &SET_FOCUS_TO_FIRST_TAG_FIELD             },
     {"sorting_file_mode",                    CV_TYPE_INT,     &SORTING_FILE_MODE                        },
     {"sorting_file_case_sensitive",          CV_TYPE_BOOL,    &SORTING_FILE_CASE_SENSITIVE              },
+    {"log_max_lines",                        CV_TYPE_INT,     &LOG_MAX_LINES                            },
+    {"sho_log_view",                         CV_TYPE_BOOL,    &SHOW_LOG_VIEW                            },
 
     {"replace_illegal_character_in_filename",          CV_TYPE_BOOL,    &REPLACE_ILLEGAL_CHARACTERS_IN_FILENAME   },
     {"filename_extension_lower_case",                  CV_TYPE_BOOL,    &FILENAME_EXTENSION_LOWER_CASE            },
@@ -211,6 +213,8 @@ tConfigVariable Config_Variables[] =
     {"process_copyright_field",                 CV_TYPE_BOOL,    &PROCESS_COPYRIGHT_FIELD                },
     {"process_url_field",                       CV_TYPE_BOOL,    &PROCESS_URL_FIELD                      },
     {"process_encoded_by_field",                CV_TYPE_BOOL,    &PROCESS_ENCODED_BY_FIELD               },
+    {"process_fields_convert_from",             CV_TYPE_STRING,  &PROCESS_FIELDS_CONVERT_FROM            },
+    {"process_fields_convert_to",               CV_TYPE_STRING,  &PROCESS_FIELDS_CONVERT_TO              },
 
     {"pf_convert_into_space",                   CV_TYPE_BOOL,    &PF_CONVERT_INTO_SPACE                  },
     {"pf_convert_space",                        CV_TYPE_BOOL,    &PF_CONVERT_SPACE                       },
@@ -339,7 +343,7 @@ void Init_Config_Variables (void)
     /*
      * Common
      */
-    LOAD_ON_STARTUP               = 1;
+    LOAD_ON_STARTUP               = 0;
     DEFAULT_PATH_TO_MP3           = g_strdup(HOME_VARIABLE);
     BROWSE_SUBDIR                 = 1;
 #ifdef WIN32
@@ -377,6 +381,8 @@ void Init_Config_Variables (void)
 #else
     SORTING_FILE_CASE_SENSITIVE             = 0;
 #endif
+    LOG_MAX_LINES                           = 50;
+    SHOW_LOG_VIEW                           = 1;
 
     MESSAGE_BOX_POSITION_NONE               = 0;
     MESSAGE_BOX_POSITION_CENTER             = 0;
@@ -471,6 +477,9 @@ void Init_Config_Variables (void)
     PROCESS_COPYRIGHT_FIELD            = 1;
     PROCESS_URL_FIELD                  = 1;
     PROCESS_ENCODED_BY_FIELD           = 1;
+    
+    PROCESS_FIELDS_CONVERT_FROM        = NULL;
+    PROCESS_FIELDS_CONVERT_TO          = NULL;
 
     PF_CONVERT_INTO_SPACE              = 1;
     PF_CONVERT_SPACE                   = 0;
@@ -646,6 +655,8 @@ void Apply_Changes_Of_Preferences_Window (void)
         SORTING_FILE_CASE_SENSITIVE            = GTK_TOGGLE_BUTTON(SortingFileCaseSensitive)->active;
         SET_FOCUS_TO_SAME_TAG_FIELD            = GTK_TOGGLE_BUTTON(SetFocusToSameTagField)->active;
         SET_FOCUS_TO_FIRST_TAG_FIELD           = GTK_TOGGLE_BUTTON(SetFocusToFirstTagField)->active;
+        LOG_MAX_LINES                          = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(LogMaxLinesSpinButton));
+        SHOW_LOG_VIEW                          = GTK_TOGGLE_BUTTON(ShowLogView)->active;
 
         SORTING_FILE_MODE = gtk_combo_box_get_active(GTK_COMBO_BOX(SortingFileCombo));
 
@@ -782,6 +793,9 @@ void Apply_Changes_Of_Preferences_Window (void)
         if (SHOW_HEADER_INFO) gtk_widget_show_all(HeaderInfosTable);
         else                  gtk_widget_hide_all(HeaderInfosTable);
 
+        if (SHOW_LOG_VIEW)  gtk_widget_show_all(LogArea);
+        else                gtk_widget_hide_all(LogArea);
+
         /* Update state of check-menu-item into main/popup menu to browse subdirs */
         Check_Menu_Item_Update_Browse_Subdir();
 
diff --git a/src/setting.h b/src/setting.h
index fceba05..a2b3042 100755..100644
--- a/src/setting.h
+++ b/src/setting.h
@@ -126,6 +126,8 @@ gint    NUMBER_TRACK_FORMATED_SPIN_BUTTON;
 gint    OGG_TAG_WRITE_XMMS_COMMENT;
 gint    SET_FOCUS_TO_SAME_TAG_FIELD;
 gint    SET_FOCUS_TO_FIRST_TAG_FIELD;
+gint    LOG_MAX_LINES;
+gint    SHOW_LOG_VIEW;
 
 
 /* Scanner */
@@ -139,7 +141,7 @@ gint    RFS_CONVERT_SPACE_INTO_UNDERSCORE;
 gint    PFS_DONT_UPPER_SOME_WORDS;
 gint    OVERWRITE_TAG_FIELD;
 gint    SET_DEFAULT_COMMENT;
-gchar   *DEFAULT_COMMENT;
+gchar  *DEFAULT_COMMENT;
 gint    SET_CRC32_COMMENT;
 gint    OPEN_SCANNER_WINDOW_ON_STARTUP;
 gint    SCANNER_WINDOW_ON_TOP;
@@ -166,6 +168,8 @@ gint    PROCESS_ORIG_ARTIST_FIELD;
 gint    PROCESS_COPYRIGHT_FIELD;
 gint    PROCESS_URL_FIELD;
 gint    PROCESS_ENCODED_BY_FIELD;
+gchar  *PROCESS_FIELDS_CONVERT_FROM;
+gchar  *PROCESS_FIELDS_CONVERT_TO;
 gint    PF_CONVERT_INTO_SPACE;
 gint    PF_CONVERT_SPACE;
 gint    PF_CONVERT;
diff --git a/src/win32/win32dep.c b/src/win32/win32dep.c
index a644adc..9e400af 100755..100644
--- a/src/win32/win32dep.c
+++ b/src/win32/win32dep.c
@@ -456,38 +456,3 @@ BOOL WINAPI DllMain ( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
     ET_dll_hInstance = hinstDLL;
     return TRUE;
 }
-
-
-/*
- * Copyright (C) 2002     Manuel Novoa III
- * Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
- *
- * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- */
-
-#include <string.h>
-#include <ctype.h>
-
-char *strcasestr(const char *s1, const char *s2)
-{
-	register const char *s = s1;
-	register const char *p = s2;
-
-	do {
-		if (!*p) {
-			return (char *) s1;;
-		}
-		if ((*p == *s)
-			|| (tolower(*((unsigned char *)p)) == tolower(*((unsigned char *)s)))
-			) {
-			++p;
-			++s;
-		} else {
-			p = s2;
-			if (!*s) {
-				return NULL;
-			}
-			s = ++s1;
-		}
-	} while (1);
-}
\ No newline at end of file
diff --git a/src/win32/win32dep.h b/src/win32/win32dep.h
index 7e5e1ae..9107852 100755..100644
--- a/src/win32/win32dep.h
+++ b/src/win32/win32dep.h
@@ -34,8 +34,6 @@
 #define chown(a,b,c)
 #define chmod(a,b)
 
-//#define strcasestr(haystack, needle) strstr(haystack, needle)
-char *strcasestr(const char *s1, const char *s2);